Commit graph

9314 commits

Author SHA1 Message Date
Tianjie Xu
ac1e0c338b Merge "Don't build host binary for applypatch" am: e9d25da64d
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1551265

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5d9f688d739df6b0fa5620d08f883fd88f675f10
2021-01-15 03:49:52 +00:00
Tianjie Xu
e9d25da64d Merge "Don't build host binary for applypatch" 2021-01-15 03:07:53 +00:00
Tianjie
b810334a8d Don't build host binary for applypatch
This solves the build failured on mac, and we don't really need a
host binary.

Test: mma
Change-Id: I55b74f411fb5385417d474b753c830c855db7794
2021-01-14 18:17:07 -08:00
Kelvin Zhang
d425351e4f Merge changes from topic "imgdiff" am: e7a060a91b am: b2c7beb2b1
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1548894

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9aa6658475c11275e806d50b1e3f5a4e319b57dd
2021-01-14 16:02:35 +00:00
Kelvin Zhang
0d375c657a Switch imgdiff to use libz_stable am: 2f2749f213 am: 9997438c1c
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1548316

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3b8c94c5257f895f97544611fe0f9fd7cf1821f9
2021-01-14 16:02:34 +00:00
Kelvin Zhang
b2c7beb2b1 Merge changes from topic "imgdiff" am: e7a060a91b
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1548894

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I05720babfa906eae2d54979e9de1e7fe4853a4c0
2021-01-14 15:40:25 +00:00
Kelvin Zhang
9997438c1c Switch imgdiff to use libz_stable am: 2f2749f213
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1548316

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib0cffbe8dcaa73377be32a7bee448e8b748c7c9f
2021-01-14 15:40:20 +00:00
Kelvin Zhang
e7a060a91b Merge changes from topic "imgdiff"
* changes:
  Re-enable failed imgpatch tests
  Switch imgdiff to use libz_stable
2021-01-14 15:04:34 +00:00
Kelvin Zhang
2f2749f213 Switch imgdiff to use libz_stable
libz contain platform dependent optimization flags, and sometimes that
cause reconstruction of blobs to fail. Use libz_stable instead

Bug: 177076632
Test: treehugger

Change-Id: I3a8c1591672537d1c754b2bc5b26f939dd80ed47
2021-01-13 10:10:15 -05:00
Kelvin Zhang
07ba4483a6 Re-enable failed imgpatch tests
Now we added a libz variant without the offending optimizations,
    re-enable tests.

Test: treehugger
Bug: 177076632
Change-Id: I6969090b2cb4c059d952df7cc034d0ed1ac366b2
2021-01-13 10:10:15 -05:00
Treehugger Robot
a88a07d8b9 Merge "Disable failed imgpatch tests" am: 043ef5ff40 am: 8775469f76
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1545084

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5a790cdc5232241e30b2be656965b164c2ee24e2
2021-01-12 22:16:52 +00:00
Treehugger Robot
8775469f76 Merge "Disable failed imgpatch tests" am: 043ef5ff40
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1545084

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1e1d94b1d38571b2f38830ca6d927d186f4a4abf
2021-01-12 22:00:07 +00:00
Treehugger Robot
043ef5ff40 Merge "Disable failed imgpatch tests" 2021-01-12 21:00:45 +00:00
Kelvin Zhang
d77e7ea105 Disable failed imgpatch tests
For a proper solution, add a variant of libz which doesn't have platform
dependent optimizations, and make imgdiff use that version.
Test: treehugger
Bug: 177076632

Change-Id: Ia9e926c1adf22d351315eeec5ad1fabc3d48efd5
2021-01-12 14:45:29 -05:00
Bill Yi
049745c912 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6246c37677 -s ours
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6551a7e630f7fd33d2083e939b503d3f52d8a4cc
2021-01-02 22:35:08 +00:00
Bill Yi
6246c37677 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I8f30c3857becececb69b1b53f3d465d9b66517e5
2021-01-02 17:31:57 +00:00
Treehugger Robot
e05c66f526 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: b9e39a0828 -s ours am: 80c5961188 -s ours
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifd1e8832208ebd4286024cbb5327e333f808a702
2021-01-02 04:29:44 +00:00
Bill Yi
d0c151d204 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: eb46e67d6a -s ours
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib976f61f1facf40f30cca0f880f4e10d4c76f820
2021-01-02 04:29:18 +00:00
Treehugger Robot
80c5961188 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: b9e39a0828 -s ours
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8bd5647fd9d78a4de1991d666d157a6e99416d5d
2021-01-02 03:47:03 +00:00
Treehugger Robot
b9e39a0828 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-01-02 03:21:43 +00:00
Bill Yi
eb46e67d6a Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I5e12a07edaf692cb0693f82a88f158a5879a9fdf
2021-01-01 10:00:19 -08:00
Bill Yi
28d73e04b5 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Iae7aeba0daf150b22c265e4924100d0564f4e8cd
2021-01-01 17:32:58 +00:00
Tianjie Xu
cca4528dac Merge "Add doc for image_generator" am: 40d4bc9e19 am: 0e46691951
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1534220

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib54b6c1f93767396277b43449525ca3642c420ba
2020-12-29 00:23:23 +00:00
Tianjie Xu
0e46691951 Merge "Add doc for image_generator" am: 40d4bc9e19
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1534220

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icd5d2af093fd32990c30322730fc3d4d18c85a08
2020-12-28 23:59:13 +00:00
Tianjie Xu
40d4bc9e19 Merge "Add doc for image_generator" 2020-12-28 23:38:57 +00:00
Treehugger Robot
28aa649e54 Merge "minui: fix mem leakage issue" am: d694016206 am: ebfe03631c
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1535652

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4aad1a4725067f54bbb29c97eb8bb0827bfd77b6
2020-12-28 08:21:25 +00:00
Treehugger Robot
ebfe03631c Merge "minui: fix mem leakage issue" am: d694016206
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1535652

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I06f9673bd94ebb8437e62f26db888d3c1cd04985
2020-12-28 07:44:45 +00:00
Treehugger Robot
d694016206 Merge "minui: fix mem leakage issue" 2020-12-28 07:08:04 +00:00
lijiazi
7d306fbf4e minui: fix mem leakage issue
Use free to release GRSurface object will not call data_'s
DataDeleter, then the buf data_ points to will leakage.
Use delete release GRSurface object.

Test: manual

Change-Id: I53a9ea5a4ad67de1662c707a5ea59d738bd9c2d8
Signed-off-by: lijiazi <lijiazi@xiaomi.com>
2020-12-23 19:21:06 +08:00
Tianjie
6450acf032 Add doc for image_generator
Bug: 143630837
Test: check preview
Change-Id: I3b7ca52e2a13685a523901092df79b039e2ad96c
2020-12-20 20:00:30 -08:00
Kelvin Zhang
51ee1b064a Merge "Do not call exit() immediately after serving sideload" am: a8e394942e am: d7c894e0bc
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1523478

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7908efc0ed88c908f20c2ce349961e4eb0398782
2020-12-15 19:12:18 +00:00
Kelvin Zhang
d7c894e0bc Merge "Do not call exit() immediately after serving sideload" am: a8e394942e
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1523478

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie1fa8397edbabb570cc276a5c26a72d88caf41bb
2020-12-15 18:49:26 +00:00
Kelvin Zhang
a8e394942e Merge "Do not call exit() immediately after serving sideload" 2020-12-15 17:52:58 +00:00
Kelvin Zhang
e32c9f728e Do not call exit() immediately after serving sideload
Wait for socket to close before exit(), so that last "DONEDONE" message
is correctly sent.

Test: enter recovery, sideload an OTA, verify that no read error occured
      on client side. Repeat 5 times.
Bug: 155158483
Change-Id: Ibb02548d8c03fb77f8f60cb69cff84c33903adc0
2020-12-14 17:22:16 -05:00
Bill Yi
0919091d63 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b1b27d1113 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id3d4b37ea10b416775abc6c4cb4c78889fa38aec
2020-12-04 09:29:33 +00:00
Bill Yi
b1b27d1113 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ic32d018d3999147ef0a9ef625006cf069e46bc74
2020-12-03 19:27:57 -08:00
Xin Li
5a454d1810 [automerger skipped] Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855 am: ade32af710 -s ours
am skip reason: Change-Id Idc15c7280ab625d015801313ae71bf04a5abdf81 with SHA-1 1c87c957f5 is in history

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

Change-Id: Iad075f593c320c9b56ccc6fe8a5b10b092c623a3
2020-12-03 04:25:16 +00:00
Xin Li
ade32af710 Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855
Bug: 172690556
Merged-In: Idc15c7280ab625d015801313ae71bf04a5abdf81
Change-Id: I2d3ec29aa5b0c162c70e7712025eaa22ec769dcc
2020-11-23 13:12:20 -08:00
Will Coster
a66580cd75 Merge "Add a fuzzer for OTA package verification" am: 6a4dbdf088 am: 923cdf3db1 am: ab1a7bb228
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1495296

Change-Id: I698733224a81087206eafc3ac1dab551f55d4904
2020-11-17 00:24:26 +00:00
Will Coster
ab1a7bb228 Merge "Add a fuzzer for OTA package verification" am: 6a4dbdf088 am: 923cdf3db1
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1495296

Change-Id: If5f5b827863fa792d60cba0962cec0737bc48b44
2020-11-17 00:10:37 +00:00
Will Coster
923cdf3db1 Merge "Add a fuzzer for OTA package verification" am: 6a4dbdf088
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1495296

Change-Id: I35603bcb3178373414b19bbaca94d270e88b827c
2020-11-16 22:59:34 +00:00
Will Coster
6a4dbdf088 Merge "Add a fuzzer for OTA package verification" 2020-11-16 22:43:19 +00:00
Will Coster
de455707e6 Add a fuzzer for OTA package verification
This is a pretty simplistic approach, it just shoves random data at the
verifier. The OTA format isn't too complicated so this should hopefully
be sufficient to let the fuzzer exercise the potentially interesting
parsing code.

Test: Let the fuzzer run on device for awhile:
      1) FUZZ=libinstall_verify_package_fuzzer
      2) SANITIZE_TARGET=hwaddress make ${FUZZ}
      3) cd ${ANDROID_PRODUCT_OUT} && adb root && adb sync data
      4) adb shell /data/fuzz/arm64/${FUZZ}/${FUZZ}
Change-Id: Icac6bde017b497d9f92c06191eb29e107ba9c0a7
2020-11-10 14:26:17 -08:00
Treehugger Robot
849a2c44c7 Merge "Expose EthernetDevice to custom UIs" am: 0feaf90f92 am: 6ab06e1de6 am: c115e8acb9
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1491198

Change-Id: Id05a6dc8f4a2380fd11b57fd51a8868f18f29daf
2020-11-10 04:50:34 +00:00
Treehugger Robot
c115e8acb9 Merge "Expose EthernetDevice to custom UIs" am: 0feaf90f92 am: 6ab06e1de6
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1491198

Change-Id: I28713dd5572a3f602c8a784d0814ced3d42d5954
2020-11-10 04:22:59 +00:00
Treehugger Robot
6ab06e1de6 Merge "Expose EthernetDevice to custom UIs" am: 0feaf90f92
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1491198

Change-Id: I3bf249a154df6cbdc3a39212e537ff96ad694c3f
2020-11-10 04:05:16 +00:00
Treehugger Robot
0feaf90f92 Merge "Expose EthernetDevice to custom UIs" 2020-11-10 03:43:33 +00:00
Alistair Delva
f7b547171e Expose EthernetDevice to custom UIs
Make it possible to build a custom UI which uses EthernetRecoveryUI.

Since EthernetRecoveryUI must be used with EthernetDevice, but the
make_device() function is the only place a custom UI can be specified,
we need to move the common EthernetDevice to the recovery_ui core and
make a new "default_ethernet_device" which looks like the other
default device library stubs, for backwards compatibility.

This makes it possible to use EthernetRecoveryUI on cuttlefish.

Bug: 172693524
Change-Id: I6a66bb949ef97d06f532adb286d2db4c002d2924
2020-11-06 16:35:46 -08:00
Baligh Uddin
a4fc503b41 [automerger skipped] Merge "Migrate system/core/adb to packages/modules/adb" am: 7bc92050e3 am: 7f4a3daee5 -s ours am: 7f3688598a -s ours
am skip reason: Change-Id Ied3afa5d19d814155c5ecbe2363ba544f2ab96b7 with SHA-1 4f22d8699c is in history

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

Change-Id: I9884463a640a2d49bc2fc4250bed310f0c8f6bef
2020-10-23 17:24:24 +00:00
Baligh Uddin
7f3688598a [automerger skipped] Merge "Migrate system/core/adb to packages/modules/adb" am: 7bc92050e3 am: 7f4a3daee5 -s ours
am skip reason: Change-Id Ied3afa5d19d814155c5ecbe2363ba544f2ab96b7 with SHA-1 4f22d8699c is in history

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

Change-Id: I370bb64af4ce8ed3bd8fcb1b72913f8a590bde26
2020-10-23 16:55:32 +00:00