Baligh Uddin
4f22d8699c
Migrate system/core/adb to packages/modules/adb
...
BUG: 167963357
Test: TH
Merged-In: Ia6b4ff799d94a0509f971086e72a60f1f1734e49
Change-Id: Ied3afa5d19d814155c5ecbe2363ba544f2ab96b7
2020-10-22 22:21:03 +00:00
Xin Li
fc010d536b
[automerger skipped] Skip ab/6749736 in stage. am: 4177367a4a
-s ours
...
am skip reason: Change-Id Iee28a5365320f99997d4ac528655786d49316373 with SHA-1 40abfc5d4d
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/12793670
Change-Id: I9681b242e718ec900126b88fb84b4e455fb5b4ee
2020-10-09 02:31:10 +00:00
Xin Li
4177367a4a
Skip ab/6749736 in stage.
...
Merged-In: Iee28a5365320f99997d4ac528655786d49316373
Change-Id: If76f2e034d87760c588f3b9fd35f9ff517c20a40
2020-10-08 17:19:20 -07:00
Tianjie Xu
b66fb5f2df
Merge "Add test config for recovery_host_test" am: aa5993ef96
am: 366ae2cc60
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1452035
Change-Id: I1983643ce149937278ce6cbb52626573db1d04bb
2020-10-07 08:10:51 +00:00
Tianjie Xu
366ae2cc60
Merge "Add test config for recovery_host_test" am: aa5993ef96
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1452035
Change-Id: Ia2aeab90cbdb438b1f43c7ac9f2d7bde1d7b2a6b
2020-10-07 07:56:30 +00:00
Tianjie Xu
aa5993ef96
Merge "Add test config for recovery_host_test"
2020-10-07 02:29:18 +00:00
Tianjie
581a824401
Add test config for recovery_host_test
...
Bump the timeout as we see some flakiness in b/170178152. The other
part of the config is copied from the auto-generated config in
out/host/linux-x86/testcases/recovery_host_test/recovery_host_test.config
Bug: 170178152
Test: treehugger
Change-Id: Ia84c90ba6a686c47ecc7d8331c7e8c7cb4b78292
2020-10-06 23:31:04 +00:00
Tianjie Xu
90994adfd8
Merge "Revert "Link to libsnapshot_cow everywhere libsnapshot is linked."" am: 577f6c2cf6
am: 4a242eddd4
am: e28723cbaf
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1447799
Change-Id: Ib0da1d5315544b978897e05317ebe16d8b251b5a
2020-10-03 20:49:30 +00:00
Tianjie Xu
e28723cbaf
Merge "Revert "Link to libsnapshot_cow everywhere libsnapshot is linked."" am: 577f6c2cf6
am: 4a242eddd4
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1447799
Change-Id: I62f1a76f105081c60ac6c75a97c18f7ca7faeb1c
2020-10-03 20:29:00 +00:00
Tianjie Xu
4a242eddd4
Merge "Revert "Link to libsnapshot_cow everywhere libsnapshot is linked."" am: 577f6c2cf6
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1447799
Change-Id: I6e082e5995b6c97b53f607dad161d3b423f85fc4
2020-10-03 20:11:09 +00:00
Tianjie Xu
577f6c2cf6
Merge "Revert "Link to libsnapshot_cow everywhere libsnapshot is linked.""
2020-10-03 19:27:32 +00:00
Tianjie Xu
00e91ff8b9
Revert "Link to libsnapshot_cow everywhere libsnapshot is linked."
...
Revert submission 1433573-vab-libsnapshot-linkage
Reason for revert: b/169981170, update crash for droidfooders.
Reverted Changes:
Ie75bba98c:Link to libsnapshot_cow where libsnapshot is linke...
Ieedfadc55:libsnapshot: Partially implement OpenSnapshotWrite...
I28a5d4a88:Link to libsnapshot_cow everywhere libsnapshot is ...
Change-Id: I8c774ca4a8dec21dd308694bb8205861a19c3e12
2020-10-03 07:27:00 +00:00
Treehugger Robot
3a9d4528f6
Merge "Link to libsnapshot_cow everywhere libsnapshot is linked." am: dd11d217a0
am: 2e37499b96
am: 6f74ef440d
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1434951
Change-Id: Ic0b6172ff565fab42aa3cbefaacf56835f09e749
2020-09-29 23:28:59 +00:00
Treehugger Robot
6f74ef440d
Merge "Link to libsnapshot_cow everywhere libsnapshot is linked." am: dd11d217a0
am: 2e37499b96
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1434951
Change-Id: Ib5fd4e74c7522da2e76bab09f37ee6e5f1d64227
2020-09-29 23:10:32 +00:00
Treehugger Robot
2e37499b96
Merge "Link to libsnapshot_cow everywhere libsnapshot is linked." am: dd11d217a0
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1434951
Change-Id: I0064853f6081407f08519e42bf440d2e41b67b06
2020-09-29 22:41:55 +00:00
Treehugger Robot
dd11d217a0
Merge "Link to libsnapshot_cow everywhere libsnapshot is linked."
2020-09-29 21:52:07 +00:00
David Anderson
6943dfe9ad
Link to libsnapshot_cow everywhere libsnapshot is linked.
...
Bug: 168554689
Test: recovery builds
Change-Id: I28a5d4a88914b10db1ca8298947afc2314a9ae8a
2020-09-22 15:49:44 -07:00
Kelvin Zhang
a5c4d3c016
Merge "Check for overflow before allocating memory fore decompression." am: c1d2c15785
am: 115a017218
am: 701b8d660d
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1430148
Change-Id: If58d53fef580810a9553a71298281e38f45798e8
2020-09-19 07:04:48 +00:00
Bill Yi
c00dfe5d95
[automerger skipped] Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: 7a899bb461
am: d3865b7a63
-s ours am: c4eabe78c5
-s ours
...
am skip reason: Change-Id I58a59150174f298ff6e2fae9cd5b4a761279458f with SHA-1 5bb0917365
is in history
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1431509
Change-Id: I104d03755da300ba9149ef9836cc488d658aed54
2020-09-19 07:01:18 +00:00
Bill Yi
ca1ba9ee45
[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: 0139ad11a5
am: 76a81f920b
-s ours am: 77fc5fd4ef
-s ours
...
am skip reason: Change-Id I58a59150174f298ff6e2fae9cd5b4a761279458f with SHA-1 5bb0917365
is in history
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1431509
Change-Id: Ia16f9953063b682ac7be51eb1def7c4c3df8bf8f
2020-09-19 07:00:55 +00:00
Kelvin Zhang
701b8d660d
Merge "Check for overflow before allocating memory fore decompression." am: c1d2c15785
am: 115a017218
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1430148
Change-Id: I6b01d5d4c208b5e16320c83ddbb8eea008dd78dd
2020-09-19 06:16:32 +00:00
Bill Yi
c4eabe78c5
[automerger skipped] Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: 7a899bb461
am: d3865b7a63
-s ours
...
am skip reason: Change-Id I58a59150174f298ff6e2fae9cd5b4a761279458f with SHA-1 5bb0917365
is in history
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1431509
Change-Id: Ia407d049114e49a25cb0b4d1d4722d2c1a34a339
2020-09-19 05:51:23 +00:00
Bill Yi
77fc5fd4ef
[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: 0139ad11a5
am: 76a81f920b
-s ours
...
am skip reason: Change-Id I58a59150174f298ff6e2fae9cd5b4a761279458f with SHA-1 5bb0917365
is in history
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1431509
Change-Id: I64353b100715073be826edd7b15c9dcffa90006e
2020-09-19 05:50:32 +00:00
Kelvin Zhang
115a017218
Merge "Check for overflow before allocating memory fore decompression." am: c1d2c15785
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1430148
Change-Id: I80c6ebef9c311c0a97e1b4d57a54d457a24c4115
2020-09-19 05:35:04 +00:00
Bill Yi
d3865b7a63
Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: 7a899bb461
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1431509
Change-Id: I0a9763656107b95ca90e40e7243190868a31337c
2020-09-19 05:23:05 +00:00
Bill Yi
76a81f920b
Merge mainline-release 6664920 to master - DO NOT MERGE am: 0139ad11a5
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1431509
Change-Id: I82d51c31e6b05c04d068f6ff2695206707c02b75
2020-09-19 05:22:30 +00:00
Kelvin Zhang
c1d2c15785
Merge "Check for overflow before allocating memory fore decompression."
2020-09-19 00:51:22 +00:00
Kelvin Zhang
d1ba38f7c9
Check for overflow before allocating memory fore decompression.
...
On 32bit devices, an ZipEntry64 may have size > 2^32, we should check
for such cases before attempting to allocate memory.
Test: mm -j
Change-Id: I0f916ef4b2a692f167719a74bd6ff2e887c6c2ce
2020-09-18 17:41:51 -04:00
Bill Yi
7a899bb461
Merge "Merge mainline-release 6664920 to master - DO NOT MERGE"
2020-09-18 18:47:53 +00:00
Bill Yi
0139ad11a5
Merge mainline-release 6664920 to master - DO NOT MERGE
...
Merged-In: I58a59150174f298ff6e2fae9cd5b4a761279458f
Change-Id: Ieec93fb9ffc33c022e7c7896675dc62b9f8a09ff
2020-09-17 21:56:55 -07:00
Kelvin Zhang
805e3a983f
Merge "Switch to zip64 in recovery" am: a35202befd
am: a973d68fcb
am: 5bb0917365
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1429048
Change-Id: Id448c6291c026c25534bc682563b9ab505bc46bf
2020-09-17 04:40:01 +00:00
Kelvin Zhang
5bb0917365
Merge "Switch to zip64 in recovery" am: a35202befd
am: a973d68fcb
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1429048
Change-Id: I58a59150174f298ff6e2fae9cd5b4a761279458f
2020-09-17 01:13:41 +00:00
Kelvin Zhang
a973d68fcb
Merge "Switch to zip64 in recovery" am: a35202befd
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1429048
Change-Id: If3de6e828aaff1953a5adc43a786f04d527667c0
2020-09-17 00:50:21 +00:00
Kelvin Zhang
a35202befd
Merge "Switch to zip64 in recovery"
2020-09-17 00:19:41 +00:00
Kelvin Zhang
4f81130039
Switch to zip64 in recovery
...
There's already library support for zip64 in libziparchive. We just need
to start using the new APIs.
Bug: 167951876
Test: Sideload a large ota package in recovery
Change-Id: I652741965f28de079d873c6822317ee9fa855201
2020-09-16 14:21:37 -04:00
Bill Yi
d757c4c90d
[automerger skipped] Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE am: b3896c679e
-s ours am: 7428812159
-s ours
...
am skip reason: Change-Id I0181ce6e0a8271fcfdfbfb5b8e5c64791693d07f with SHA-1 4b028fac0b
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/12578853
Change-Id: I4adddd8fc32af1a6891083a57e987759e3e1f1b5
2020-09-14 21:50:52 +00:00
Bill Yi
7428812159
[automerger skipped] Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE am: b3896c679e
-s ours
...
am skip reason: Change-Id I0181ce6e0a8271fcfdfbfb5b8e5c64791693d07f with SHA-1 4b028fac0b
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/12578853
Change-Id: Id8104464c62a01be2b0db3e56c515b91015f7578
2020-09-14 21:18:48 +00:00
Bill Yi
b3896c679e
Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE
...
Merged-In: I0181ce6e0a8271fcfdfbfb5b8e5c64791693d07f
Change-Id: I8bce5f15127d0ea06a2a1efe53aa6f2b16444125
2020-09-13 07:58:37 -07:00
Xin Li
37059f4ee5
[automerger skipped] Merge "Merge Android R" am: 2172474d50
-s ours am: c975ecfe33
-s ours am: 4b028fac0b
-s ours
...
am skip reason: Change-Id I22ea459266eeb88509fefb34277e6426166e2502 with SHA-1 e1e08fc8d1
is in history
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1421705
Change-Id: Ib919ddf67b6dfc8166fd0a62591426516caa8c86
2020-09-11 03:33:10 +00:00
Xin Li
4b028fac0b
[automerger skipped] Merge "Merge Android R" am: 2172474d50
-s ours am: c975ecfe33
-s ours
...
am skip reason: Change-Id I22ea459266eeb88509fefb34277e6426166e2502 with SHA-1 e1e08fc8d1
is in history
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1421705
Change-Id: I0181ce6e0a8271fcfdfbfb5b8e5c64791693d07f
2020-09-11 02:02:19 +00:00
Xin Li
c975ecfe33
[automerger skipped] Merge "Merge Android R" am: 2172474d50
-s ours
...
am skip reason: Change-Id I22ea459266eeb88509fefb34277e6426166e2502 with SHA-1 e1e08fc8d1
is in history
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1421705
Change-Id: Ia3b57074613c623ea3105505c4b32b29baba3436
2020-09-11 00:39:35 +00:00
Xin Li
2172474d50
Merge "Merge Android R"
2020-09-10 17:22:18 +00:00
Xin Li
7d57e8e43e
Merge Android R
...
Bug: 168057903
Merged-In: I22ea459266eeb88509fefb34277e6426166e2502
Change-Id: I61f0ddc32a51997cca143ec58d0a6b08453a8b32
2020-09-08 16:52:45 -07:00
Treehugger Robot
50f2a5cabb
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: b1afe09da2
-s ours am: e1e08fc8d1
-s ours am: b105b0b821
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1420415
Change-Id: Iec1ea82bf54fb3a27ca516b1f7f23287a76097ad
2020-09-05 15:16:29 +00:00
Treehugger Robot
b105b0b821
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: b1afe09da2
-s ours am: e1e08fc8d1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1420415
Change-Id: Iaaf0aca6158ef915761a658361b747d7300b93d1
2020-09-05 15:01:57 +00:00
Treehugger Robot
e1e08fc8d1
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: b1afe09da2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1420415
Change-Id: I22ea459266eeb88509fefb34277e6426166e2502
2020-09-05 14:26:05 +00:00
Treehugger Robot
b1afe09da2
Merge "Import translations. DO NOT MERGE ANYWHERE"
2020-09-05 13:51:55 +00:00
Bill Yi
065d5a7755
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ie5d70a5d2923833172fc27f21a1f96ef484ed9eb
2020-09-05 07:36:49 +00:00
Treehugger Robot
5f513949c3
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 3202d82adb
-s ours am: c07f2aa249
-s ours am: ca94ed0350
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1420265
Change-Id: I860f65822e69d05b98755efeabd978e26fd3bfb2
2020-09-05 05:30:58 +00:00
Treehugger Robot
ca94ed0350
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 3202d82adb
-s ours am: c07f2aa249
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1420265
Change-Id: Idb6ccc86c4f8cd41916618862846123aebe25ee2
2020-09-05 04:34:39 +00:00