tequilaOS/platform_bootable_recovery
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
9031 commits 1 branch 0 tags 82 MiB
Commit graph

9031 commits

This branch
This branch
All branches
Author SHA1 Message Date
Baligh Uddin
0e313c1c2c Migrate system/core/adb to packages/modules/adb 
BUG: 167963357
Test: TH
Merged-In: Ied3afa5d19d814155c5ecbe2363ba544f2ab96b7
Change-Id: Ied65135d7c635d1675af591ccc64c26632935161
 2020-10-23 03:42:07 +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
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
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
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
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
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
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
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
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
c07f2aa249 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 3202d82adb -s ours 
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1420265

Change-Id: I886ba93e69aa1357ff3db01c62d3c493e20d8e1b
 2020-09-05 04:22:02 +00:00
Treehugger Robot
3202d82adb Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-09-05 04:07:18 +00:00
Bill Yi
9fa4720b67 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I41f8bdbf7e391f15669d7397e1035276e94018e0
 2020-09-04 18:49:03 -07:00
Bill Yi
de521d2b0d Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ia586562662d1a1a833301a19db5cac66e39a689b
 2020-09-02 06:36:09 +00:00
Xin Li
6b3621a8c1 Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) 
Bug: 166295507
Merged-In: Id0fd2855f322967c1169f246d44e55a9dfdad6bb
Change-Id: Ic3ff0b38939d817df63ab5fdc2860781b69a53ce
 2020-08-27 10:16:03 -07:00
Treehugger Robot
d66516ea7c Merge "Fix flaky tests by require root for minadbd_tests" am: f820e62701 
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1409248

Change-Id: I03831287fb050c5ed536714d15085fd6efb09d2b
 2020-08-24 21:16:18 +00:00
Treehugger Robot
f820e62701 Merge "Fix flaky tests by require root for minadbd_tests" 2020-08-24 20:05:05 +00:00
Kelvin Zhang
d7ae5a020c Fix flaky tests by require root for minadbd_tests 
minadbd tests require access to /dev/fuse, therefore needs to run as
root. This test has been flaky because root preparetor wasn't specified.

Bug: 165604640
Test: atest MinadbdServicesTest
Change-Id: I6ee1e2deede4352e28aad79c436ec5974e7d64f6
 2020-08-24 14:36:01 -04:00
Treehugger Robot
c55e7fd95d Merge "Return the correct action for PromptAndWait" am: 99277fa6af 
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1398888

Change-Id: I8b8a07f433aa34cd29de401f3137c6992812dc20
 2020-08-18 03:17:12 +00:00
Treehugger Robot
99277fa6af Merge "Return the correct action for PromptAndWait" 2020-08-18 03:05:47 +00:00
Kelvin Zhang
9ebf0653bf Return the correct action for PromptAndWait 
Bug: 163613552
Test: mma
Change-Id: I204f6aa272c2b56725e658e5613530b27bd223c6
 2020-08-13 18:16:40 -04:00
Bill Yi
40abfc5d4d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f81364cd8c -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/12288327

Change-Id: Iee28a5365320f99997d4ac528655786d49316373
 2020-08-03 05:08:25 +00:00
Bill Yi
f81364cd8c Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: If8fe8b3e5842518a2c61da1ecf1aaddcfc9c24e3
 2020-08-02 17:10:14 +00:00
Tianjie Xu
8885ef0529 Merge changes I0f3f0333,If447b2cf am: 435a5fc0c2 am: 74538db684 am: 435f3d3f16 
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1371051

Change-Id: I1073cc8f2e1710681d5aba74e037480023188747
 2020-07-24 19:49:50 +00:00
Tianjie Xu
435f3d3f16 Merge changes I0f3f0333,If447b2cf am: 435a5fc0c2 am: 74538db684 
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1371051

Change-Id: I9fdb4e98eebc0caa9aa1a2bcc9e188a2b6fa6a81
 2020-07-24 19:31:13 +00:00
Tianjie Xu
74538db684 Merge changes I0f3f0333,If447b2cf am: 435a5fc0c2 
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1371051

Change-Id: Ibfa4188fb6efc1455eb48069ce925adecfc9fd6c
 2020-07-24 19:12:49 +00:00
Tianjie Xu
435a5fc0c2 Merge changes I0f3f0333,If447b2cf 
* changes:
  Update language to comply with Android’s inclusive language guidance
  Fix some wording to comply with respectful-code
 2020-07-24 18:57:26 +00:00
Tianjie
78d1514173 Update language to comply with Android’s inclusive language guidance 
https: //source.android.com/setup/contribute/respectful-code
Bug: 161896447
Test: Unit tests pass
Change-Id: I0f3f0333dbccc94241a096ca5d3d9bc28c281492
 2020-07-23 14:02:21 -07:00
Tianjie
1bc976a74e Fix some wording to comply with respectful-code 
https: //source.android.com/setup/contribute/respectful-code
Test: Unit tests pass
Change-Id: If447b2cf923f6bc7a3a3fb5f69b9fbc06a200ebb
 2020-07-23 13:07:24 -07:00
Bill Yi
21bd948d94 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fd33b4992d -s ours am: 934505ba52 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/12182454

Change-Id: I2f364e4721f25aced4a402c72dac603b220167c9
 2020-07-18 02:34:52 +00:00
Bill Yi
96785f4748 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fd33b4992d -s ours am: 412ba02427 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/12182454

Change-Id: I26a3a9067f77c052def3ee7978119f28448c9603
 2020-07-18 02:34:24 +00:00
Bill Yi
934505ba52 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fd33b4992d -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/12182454

Change-Id: Id0fd2855f322967c1169f246d44e55a9dfdad6bb
 2020-07-18 02:09:06 +00:00