Johan Torås Halseth
9f23feae1f
Merge "Move adb backup/restore helptext to adb shell bu help." am: 4a36cc7cf6
...
am: 8898a151e6
Change-Id: I07bdc73b924280a4960bec4d087fe08286e8f60e
2017-04-12 09:22:22 +00:00
Johan Torås Halseth
8898a151e6
Merge "Move adb backup/restore helptext to adb shell bu help."
...
am: 4a36cc7cf6
Change-Id: I89f97a7885fad7ed9456b1f2e63013e00a707a08
2017-04-12 09:16:52 +00:00
Johan Torås Halseth
4a36cc7cf6
Merge "Move adb backup/restore helptext to adb shell bu help."
2017-04-12 09:10:29 +00:00
Tom Cherry
6c2e8b10fe
Merge "ueventd: remove /dev/log" am: 120add07ab
...
am: 9ae606d659
Change-Id: Id68761b8aa9b72a4b2d78cbc42f4babfc01663bf
2017-04-12 08:11:32 +00:00
Tom Cherry
9ae606d659
Merge "ueventd: remove /dev/log"
...
am: 120add07ab
Change-Id: I136158c1f82ade6c6f41b2c02f9b4d6a592fe4c6
2017-04-12 08:06:02 +00:00
Keun-young Park
493c2cd50f
Merge "use s_max_mnt_count to detect mke2fs generated partition" am: 2e3abe2d05
...
am: 1dc9738730
Change-Id: I7e0966f9bbcb1ada7d8b4808d5462a5cee5e9eb4
2017-04-12 08:01:11 +00:00
Treehugger Robot
120add07ab
Merge "ueventd: remove /dev/log"
2017-04-12 07:58:33 +00:00
Keun-young Park
1dc9738730
Merge "use s_max_mnt_count to detect mke2fs generated partition"
...
am: 2e3abe2d05
Change-Id: I239527498a38084c472f1629017c993a1a52f41c
2017-04-12 07:55:43 +00:00
Treehugger Robot
2e3abe2d05
Merge "use s_max_mnt_count to detect mke2fs generated partition"
2017-04-12 07:45:13 +00:00
Tom Cherry
ed5f8ca6e9
Merge "ueventd: replace char** links with std::vector<std::string>" am: 162118928e
...
am: a778c81e11
Change-Id: I9511394bb5edd957ca8c1a930a09c2006c6372ea
2017-04-12 01:10:52 +00:00
Tom Cherry
a778c81e11
Merge "ueventd: replace char** links with std::vector<std::string>"
...
am: 162118928e
Change-Id: I3d6a16d0da51e3b45cdc607db0d93bc12d0767c3
2017-04-12 01:05:21 +00:00
Treehugger Robot
162118928e
Merge "ueventd: replace char** links with std::vector<std::string>"
2017-04-12 00:57:35 +00:00
Keun-young Park
95e233f9ff
use s_max_mnt_count to detect mke2fs generated partition
...
- Old tool will set it to 10 while mke2fs will set it to -1.
- For now, only tag it.
- TODO: possibly add different policy per image tool version.
bug: 32246772
Test: check dmesg after reboot
Change-Id: Ib763f8ba64957412d2b02a9d6e3fc2bfcf55851e
2017-04-11 17:55:14 -07:00
Tom Cherry
d4ff8d83d3
ueventd: remove /dev/log
...
This was marked deprecated in 2014 and removed in 2015, let's remove
the uevent rule now too.
Test: see that logging still works on bullhead
Change-Id: Idaf3f49a1afe7046eba6c976628b9f1c8b3ec094
2017-04-11 21:35:46 +00:00
Tianjie Xu
085efd7931
Do Not Merge: Fix out of bound read in libziparchive am: 6fdfd58fe1
-s ours am: 2b4a6de426
am: 556afe82f2
-s ours am: de0f0b8ecc
am: 89054eb706
am: ebcba388f5
am: 1bc2862ac5
-s ours am: c800d82044
am: 497461adc5
am: 02e7225f78
am: 587efe8ee9
...
am: 745f034705
Change-Id: Id2b7e44f75295eb20a0d55aa8abc7a3c6ce9969e
2017-04-11 20:25:32 +00:00
Tianjie Xu
ed22016d12
Do Not Merge: Fix out of bound read in libziparchive am: a8d932f2a5
am: 368f3d273d
-s ours am: f7903d4374
am: 18ccbc2ece
am: df5ee70490
am: cce7621064
-s ours am: 01574980eb
am: 2d37855038
am: 3c3eed744e
am: 5fa554a46a
...
am: 223de992a4
Change-Id: Id39959956c2ce2f8910d69e31ee5fe9a2638e7b6
2017-04-11 20:20:01 +00:00
Tianjie Xu
745f034705
Do Not Merge: Fix out of bound read in libziparchive am: 6fdfd58fe1
-s ours am: 2b4a6de426
am: 556afe82f2
-s ours am: de0f0b8ecc
am: 89054eb706
am: ebcba388f5
am: 1bc2862ac5
-s ours am: c800d82044
am: 497461adc5
am: 02e7225f78
...
am: 587efe8ee9
Change-Id: Ief97c37295007df0da7ae36efeee8ac541f5e722
2017-04-11 20:20:01 +00:00
Tianjie Xu
223de992a4
Do Not Merge: Fix out of bound read in libziparchive am: a8d932f2a5
am: 368f3d273d
-s ours am: f7903d4374
am: 18ccbc2ece
am: df5ee70490
am: cce7621064
-s ours am: 01574980eb
am: 2d37855038
am: 3c3eed744e
...
am: 5fa554a46a
Change-Id: I80db3090f5ab0efd50051a5fec2c61a5e947ab50
2017-04-11 20:15:01 +00:00
Tianjie Xu
587efe8ee9
Do Not Merge: Fix out of bound read in libziparchive am: 6fdfd58fe1
-s ours am: 2b4a6de426
am: 556afe82f2
-s ours am: de0f0b8ecc
am: 89054eb706
am: ebcba388f5
am: 1bc2862ac5
-s ours am: c800d82044
am: 497461adc5
...
am: 02e7225f78
Change-Id: I687fc898264c93bedb34076bfa6d981d5059f381
2017-04-11 20:15:01 +00:00
Tianjie Xu
f4bb9db0a8
Fix out of bound read in libziparchive am: d9fd1863f4
am: 6908996434
am: 25c0d68d29
am: ed33065bfc
am: bc8c8e4b56
am: afddaba0cc
am: 0b1ad23070
am: d4b4f0a1e1
...
am: 2aea56db64
Change-Id: Icecc6630e82f43360d55b925a5946ffd0d608f58
2017-04-11 20:11:00 +00:00
Tianjie Xu
02e7225f78
Do Not Merge: Fix out of bound read in libziparchive am: 6fdfd58fe1
-s ours am: 2b4a6de426
am: 556afe82f2
-s ours am: de0f0b8ecc
am: 89054eb706
am: ebcba388f5
am: 1bc2862ac5
-s ours am: c800d82044
...
am: 497461adc5
Change-Id: I0b66858b609852df5a04aed279412fb2d03975a2
2017-04-11 20:11:00 +00:00
Tianjie Xu
5fa554a46a
Do Not Merge: Fix out of bound read in libziparchive am: a8d932f2a5
am: 368f3d273d
-s ours am: f7903d4374
am: 18ccbc2ece
am: df5ee70490
am: cce7621064
-s ours am: 01574980eb
am: 2d37855038
...
am: 3c3eed744e
Change-Id: I065c6eb98fcd7af9e486a211fb6f8611bcc7a5d3
2017-04-11 20:10:30 +00:00
Adam Lesinski
5382a520e0
Merge "ZipWriter: Keep LFH and CFH in sync" am: a309bc491d
...
am: 80d8a9350c
Change-Id: Ic6b7335a0af0203368fda3f5fb130716229ec0d8
2017-04-11 20:05:26 +00:00
Tianjie Xu
2aea56db64
Fix out of bound read in libziparchive am: d9fd1863f4
am: 6908996434
am: 25c0d68d29
am: ed33065bfc
am: bc8c8e4b56
am: afddaba0cc
am: 0b1ad23070
...
am: d4b4f0a1e1
Change-Id: Ib8d12d33296b0b5d618f4815e99eddebda342a5a
2017-04-11 20:05:01 +00:00
Tianjie Xu
3c3eed744e
Do Not Merge: Fix out of bound read in libziparchive am: a8d932f2a5
am: 368f3d273d
-s ours am: f7903d4374
am: 18ccbc2ece
am: df5ee70490
am: cce7621064
-s ours am: 01574980eb
...
am: 2d37855038
Change-Id: I7cd9d0c60ef387cac0454e2adbe6d437899212a6
2017-04-11 20:05:01 +00:00
Tianjie Xu
497461adc5
Do Not Merge: Fix out of bound read in libziparchive am: 6fdfd58fe1
-s ours am: 2b4a6de426
am: 556afe82f2
-s ours am: de0f0b8ecc
am: 89054eb706
am: ebcba388f5
am: 1bc2862ac5
-s ours
...
am: c800d82044
Change-Id: I09b7718561380c974ce2977b4390e12f262c11d7
2017-04-11 20:05:01 +00:00
Adam Lesinski
80d8a9350c
Merge "ZipWriter: Keep LFH and CFH in sync"
...
am: a309bc491d
Change-Id: I06f20c0edf1cc60bd39f38d45d512cfbf39bb0a9
2017-04-11 20:00:27 +00:00
Tianjie Xu
d4b4f0a1e1
Fix out of bound read in libziparchive am: d9fd1863f4
am: 6908996434
am: 25c0d68d29
am: ed33065bfc
am: bc8c8e4b56
am: afddaba0cc
...
am: 0b1ad23070
Change-Id: I7aa4a7bb1e6b5619faadfb4cb3e047746a58b71a
2017-04-11 19:59:59 +00:00
Tianjie Xu
2d37855038
Do Not Merge: Fix out of bound read in libziparchive am: a8d932f2a5
am: 368f3d273d
-s ours am: f7903d4374
am: 18ccbc2ece
am: df5ee70490
am: cce7621064
-s ours
...
am: 01574980eb
Change-Id: I3a929ddc6eb1833b0653511d810662dcbaab8153
2017-04-11 19:59:59 +00:00
Tianjie Xu
c800d82044
Do Not Merge: Fix out of bound read in libziparchive am: 6fdfd58fe1
-s ours am: 2b4a6de426
am: 556afe82f2
-s ours am: de0f0b8ecc
am: 89054eb706
am: ebcba388f5
...
am: 1bc2862ac5
-s ours
Change-Id: Id0399ee88604a6128e6ce3f7ee934c033d083861
2017-04-11 19:59:58 +00:00
Tianjie Xu
0b1ad23070
Fix out of bound read in libziparchive am: d9fd1863f4
am: 6908996434
am: 25c0d68d29
am: ed33065bfc
am: bc8c8e4b56
...
am: afddaba0cc
Change-Id: Ie8f3874506403c092719f595fa7fb2402c6ecf36
2017-04-11 19:55:28 +00:00
Tianjie Xu
01574980eb
Do Not Merge: Fix out of bound read in libziparchive am: a8d932f2a5
am: 368f3d273d
-s ours am: f7903d4374
am: 18ccbc2ece
am: df5ee70490
...
am: cce7621064
-s ours
Change-Id: I38c3c45a1043f56a1283d1ed5ad24016ab216bce
2017-04-11 19:55:28 +00:00
Tianjie Xu
1bc2862ac5
Do Not Merge: Fix out of bound read in libziparchive am: 6fdfd58fe1
-s ours am: 2b4a6de426
am: 556afe82f2
-s ours am: de0f0b8ecc
am: 89054eb706
...
am: ebcba388f5
Change-Id: Ief12b93faaa3517e750b1702db487bb6e276d14b
2017-04-11 19:55:28 +00:00
Tianjie Xu
afddaba0cc
Fix out of bound read in libziparchive am: d9fd1863f4
am: 6908996434
am: 25c0d68d29
am: ed33065bfc
...
am: bc8c8e4b56
Change-Id: I08e7c9e5c287c920e9c04a4e83f1862646a72e27
2017-04-11 19:51:00 +00:00
Tianjie Xu
cce7621064
Do Not Merge: Fix out of bound read in libziparchive am: a8d932f2a5
am: 368f3d273d
-s ours am: f7903d4374
am: 18ccbc2ece
...
am: df5ee70490
Change-Id: I456228354620c7f5bdf5ccfee6ce9dbbea2e2e8d
2017-04-11 19:50:58 +00:00
Tianjie Xu
ebcba388f5
Do Not Merge: Fix out of bound read in libziparchive am: 6fdfd58fe1
-s ours am: 2b4a6de426
am: 556afe82f2
-s ours am: de0f0b8ecc
...
am: 89054eb706
Change-Id: I817162cb2f4e01ac88b1d81f3e7761a3110d116f
2017-04-11 19:50:57 +00:00
Tianjie Xu
bc8c8e4b56
Fix out of bound read in libziparchive am: d9fd1863f4
am: 6908996434
am: 25c0d68d29
...
am: ed33065bfc
Change-Id: Ia2b0e05ae0e248d692d9ad4ad62e53613203f08e
2017-04-11 19:45:58 +00:00
Tianjie Xu
df5ee70490
Do Not Merge: Fix out of bound read in libziparchive am: a8d932f2a5
am: 368f3d273d
-s ours am: f7903d4374
...
am: 18ccbc2ece
Change-Id: Ib81a39d60f1d4e7551d759c6da5707c752eaf657
2017-04-11 19:45:58 +00:00
Tianjie Xu
89054eb706
Do Not Merge: Fix out of bound read in libziparchive am: 6fdfd58fe1
-s ours am: 2b4a6de426
am: 556afe82f2
-s ours
...
am: de0f0b8ecc
Change-Id: I71fa5fa39cc2ffc1dde4a68102399f349ee24d72
2017-04-11 19:45:57 +00:00
Treehugger Robot
a309bc491d
Merge "ZipWriter: Keep LFH and CFH in sync"
2017-04-11 19:42:21 +00:00
Tianjie Xu
18ccbc2ece
Do Not Merge: Fix out of bound read in libziparchive am: a8d932f2a5
am: 368f3d273d
-s ours
...
am: f7903d4374
Change-Id: Ic2cb35bbe317ef86c7eb177d53402d82a1cbe508
2017-04-11 19:39:58 +00:00
Tianjie Xu
ed33065bfc
Fix out of bound read in libziparchive am: d9fd1863f4
am: 6908996434
...
am: 25c0d68d29
Change-Id: I81cde93d4a07077ef54a46d589db868019ac1520
2017-04-11 19:39:57 +00:00
Tianjie Xu
de0f0b8ecc
Do Not Merge: Fix out of bound read in libziparchive am: 6fdfd58fe1
-s ours am: 2b4a6de426
...
am: 556afe82f2
-s ours
Change-Id: I90fc8d44976b063e450580b5bcb1a079ac09604b
2017-04-11 19:39:56 +00:00
Tianjie Xu
25c0d68d29
Fix out of bound read in libziparchive am: d9fd1863f4
...
am: 6908996434
Change-Id: Ie3b3e2f6c37ae9495e599f1add092bff39976b3f
2017-04-11 19:34:28 +00:00
Tianjie Xu
556afe82f2
Do Not Merge: Fix out of bound read in libziparchive am: 6fdfd58fe1
-s ours
...
am: 2b4a6de426
Change-Id: I20e184d8333c0aff48c326fad67909fcf7dc527e
2017-04-11 19:34:28 +00:00
Tianjie Xu
f7903d4374
Do Not Merge: Fix out of bound read in libziparchive am: a8d932f2a5
...
am: 368f3d273d
-s ours
Change-Id: I5cc4d5761c5d7f2b8bcee551a693c1858a7bebd1
2017-04-11 19:34:26 +00:00
Tianjie Xu
6908996434
Fix out of bound read in libziparchive
...
am: d9fd1863f4
Change-Id: I5fd0004842ab44ee1c5d38386d7073003eb94a98
2017-04-11 19:29:57 +00:00
Tianjie Xu
368f3d273d
Do Not Merge: Fix out of bound read in libziparchive
...
am: a8d932f2a5
Change-Id: I8f373dc3d2e4ecb3aecd5a43f32e3ef01474e712
2017-04-11 19:29:57 +00:00
Tianjie Xu
2b4a6de426
Do Not Merge: Fix out of bound read in libziparchive
...
am: 6fdfd58fe1
-s ours
Change-Id: I04571849d6e4140ac505e33338f9ecaa321ff3dd
2017-04-11 19:29:56 +00:00
Johan Toras Halseth
eca1b3bdcc
Move adb backup/restore helptext to adb shell bu help.
...
Key/value support for adb backup was added in ag/1946677, and help text
for adb shell bu is added in ag/2088937. This CL points the user to this
helptext instead of keeping it here, since it can quickly get out of
sync.
BUG=36170696
Test: adb
Change-Id: Ic40679f421a32e60f292ad20b726a89bfff03349
2017-04-11 19:15:17 +01:00