Commit graph

9243 commits

Author SHA1 Message Date
Tianjie Xu
8082b71f45 Merge "Bring up the erase animation early for data wipe" 2021-03-11 05:30:17 +00:00
Xin Li
a952c55faf Merge "Merge RQ2A.210305.007" 2021-03-03 21:41:37 +00:00
Xin Li
16c0fc41ae Merge RQ2A.210305.007
Bug: 180401296
Merged-In: I90dcd247e1541f3bf7f16d95c7cef6256ae462aa
Change-Id: Icfa724d8b03a581efc222d94b001add39c369caf
2021-03-03 09:12:01 -08:00
Tianjie
32b4e72a24 Bring up the erase animation early for data wipe
Right now the "Erasing" animation displays after the merge step
during the FDR process; and the merge can take 3-4 minutes. The
users maybe confused about the blank screen and forcefully
reboot the device.

Bug: 181636823
Test: add sleep merge, check the animation displays correctly.
Change-Id: Ib23b1ed3a84e95640271a429c51a3d3c142dc404
2021-03-02 16:42:07 -08:00
Treehugger Robot
4de32b2fb2 Merge "Update ImageGenerator to match the latest font names." am: 2fb99930fc
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1607136

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I90dcd247e1541f3bf7f16d95c7cef6256ae462aa
2021-02-26 18:59:15 +00:00
Treehugger Robot
2fb99930fc Merge "Update ImageGenerator to match the latest font names." 2021-02-26 18:38:22 +00:00
Treehugger Robot
79f73eea4b Merge "Switch care_map_generator.py to Python 3." am: f2e577eda8
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1606758

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8549330bbd65ef7092e9892ea668a59e0ccbef34
2021-02-26 00:55:25 +00:00
Treehugger Robot
f2e577eda8 Merge "Switch care_map_generator.py to Python 3." 2021-02-25 23:07:40 +00:00
Krzysztof Kosiński
9c857f8fb1 Switch care_map_generator.py to Python 3.
This is the last remaining use of the python-symbol library
from Python 2.

Test: Ran 2to3 on the script, no changes reported.
Change-Id: I9c8bf4840eaf1832cabc4b6af831f5c2de554d4f
2021-02-25 12:09:38 -08:00
Seigo Nonaka
a506100ef1 Update ImageGenerator to match the latest font names.
To be able to update the font by font updater, the font file needs
to match with PostScript names.

Bug: 179952916
Test: m fontchain_lint

Merged-In: Ie1e2f9ee85625216be6b2cb0781df34faec97673
Change-Id: Iab8b9d65af4b44d3ac59135c6b2a8d8990b17963
2021-02-25 01:43:19 +00:00
Xin Li
fea7439a2e Merge ab/7061308 into stage.
Bug: 180401296
Merged-In: I6551a7e630f7fd33d2083e939b503d3f52d8a4cc
Change-Id: I1ee53fc99df7e790adddf08813faacb6ce22c164
2021-02-21 09:24:22 -08:00
Tianjie Xu
44cea7efc8 Merge "updater: Do not null terminate mount_flags_list array" am: be54337fab
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1590176

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I526cd62d7e1df1cd0bef8794dde3e649a724056a
2021-02-17 20:10:09 +00:00
Tianjie Xu
be54337fab Merge "updater: Do not null terminate mount_flags_list array" 2021-02-17 19:37:52 +00:00
Alessandro Astone
1dfb086ca8 updater: Do not null terminate mount_flags_list array
mount_flags_list is a c-style NULL terminated array, but when
iterating over it via
    for (const auto& [name, value] : mount_flags_list)
the last { 0, 0 } is considered a valid entry.
Then `name` is NULL but checked with (flag == name),
which causes SIGSEGV.

Also move the definition to within setMountFlag()
and make it an std::pair array

Change-Id: Ia6670113620c6e8f95151fda764c3ab40bc2d67e
2021-02-17 00:05:54 +01:00
Treehugger Robot
d9a0aa10ba Merge "[LSC] Add LOCAL_LICENSE_KINDS to bootable/recovery" am: 1055a2f07a
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1589034

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I781a69d08c036beed6eb5aac3b8bf1eb1d7e99d4
2021-02-16 18:18:34 +00:00
Treehugger Robot
1055a2f07a Merge "[LSC] Add LOCAL_LICENSE_KINDS to bootable/recovery" 2021-02-16 17:44:06 +00:00
Bob Badour
29be3f6ef1 [LSC] Add LOCAL_LICENSE_KINDS to bootable/recovery
Added SPDX-license-identifier-Apache-2.0 to:
  applypatch/Android.bp
  bootloader_message/Android.bp
  edify/Android.bp
  fuse_sideload/Android.bp
  install/Android.bp
  minadbd/Android.bp
  minui/Android.bp
  otautil/Android.bp
  recovery_ui/Android.bp
  recovery_utils/Android.bp
  tests/Android.bp
  tools/image_generator/Android.bp
  tools/recovery_l10n/Android.bp
  uncrypt/Android.bp
  update_verifier/Android.bp
  updater/Android.bp
  updater/Android.mk
  updater_sample/Android.bp
  updater_sample/tests/Android.bp

Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-MIT
    SPDX-license-identifier-OFL
to:
  Android.bp
  Android.mk

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all

Exempt-From-Owner-Approval: janitorial work
Change-Id: I3da761b525452838977297f773974000d4de7bd6
2021-02-14 10:37:20 -08:00
Treehugger Robot
ffa2392e12 Merge "recovery: don't mount acct" am: c136106159
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1584437

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8f6ed716fd8c871f0040bf891e545ef165d07bd6
2021-02-13 21:51:47 +00:00
Treehugger Robot
c136106159 Merge "recovery: don't mount acct" 2021-02-13 21:32:31 +00:00
Marco Ballesio
65851cad82 recovery: don't mount acct
/acct is not necessary anymore for process group creation (it migrated
to /sys/fs/cgroup and is automatically mounted by libprocessgroup)

Bug: 168907513
Test: booted in remote mode and tested adb sideload
Change-Id: Iaa455df65f393ac1f67ae81c6e78d8f4934d88a2
2021-02-11 16:36:50 -08:00
Julien Desprez
7206540a30 Merge "Clean up TEST_MAPPING after default update" am: 8f014fa506
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1584430

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6a7e9943504ad0675e3859f807cf4a92aa1a247e
2021-02-11 20:01:53 +00:00
Julien Desprez
8f014fa506 Merge "Clean up TEST_MAPPING after default update" 2021-02-11 19:44:59 +00:00
Julien Desprez
2f1a1bafb4 Clean up TEST_MAPPING after default update
cc_test_host doesn't need TEST_MAPPING config anymore to run in
presubmit. (go/a-unit-tests)

Change-Id: Ia07ea311cf6febc2f937ab14966ad21dfd623c69
Test: presubmit
Bug: 178646865
2021-02-11 04:32:26 +00:00
Treehugger Robot
88a0f6edaa Merge "Fix SnapshotManager instantiation." am: bc1165edbc
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1576377

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2edb114694d02699c3809285349eecf3d41e9df3
2021-02-08 22:13:54 +00:00
Treehugger Robot
bc1165edbc Merge "Fix SnapshotManager instantiation." 2021-02-08 21:30:11 +00:00
Bob Badour
f0e8422f95 Merge "Fix license_type. Contains OFL" am: 50b96cdf73
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1573923

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I66864084d3187ce37769be5849482828ad812e7f
2021-02-08 20:51:32 +00:00
Bob Badour
50b96cdf73 Merge "Fix license_type. Contains OFL" 2021-02-08 20:11:59 +00:00
David Anderson
ebce8e6306 Fix SnapshotManager instantiation.
New() should be used instead of NewForFirstStageMount().

Bug: 168258606
Test: data wipe with VABC merge in progress
Change-Id: Idf2b01a504b577766da303091721764242e99a69
2021-02-04 20:23:15 -08:00
Bob Badour
a74bba9e01 Fix license_type. Contains OFL
See: http://go/android-license-checking-v2-lsc

Test: m all

Bug: 151953481
Bug: 151177513
Bug: 67772237

Exempt-From-Owner-Approval: janitorial work
Change-Id: Iaa673cbfa9ad46b03e90c11cdebf935e892b53a7
2021-02-03 12:15:52 -08:00
Elliott Hughes
fd8cccb318 Merge "minui: remove libadf since it is no longer supported" am: 0cd9a63603
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1556560

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie57d2e60bc14cae40f0f46b5f06ab62fd4b865da
2021-01-22 01:06:09 +00:00
Elliott Hughes
0cd9a63603 Merge "minui: remove libadf since it is no longer supported" 2021-01-22 00:43:29 +00:00
Marissa Wall
7429176260 minui: remove libadf since it is no longer supported
Libadf is being removed since there are no android common kernels
that support adf. Remove support from miniui.

Test: Compiles and boots
Bug: 150467766

Change-Id: Ic66ea7a012b0466810ddeb8f884150b50c8ae769
2021-01-21 14:05:21 -08:00
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
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
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