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
android-build-team Robot
edbe41c42f
Snap for 7180697 from e2493a8826
to rvc-qpr3-release
...
Change-Id: Ic37c1971f80162cbdd2ab71a0d42e7559362d7cf
2021-03-03 00:21:18 +00:00
Bill Yi
414e13660d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e2493a8826
-s ours am: 184d58aa2e
-s ours am: e8db3f117a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/13738545
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5c0e5bdff1b57cf20d6b954a9eeb2f391b1044db
2021-03-02 21:52:01 +00:00
Bill Yi
c2d87ee61d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e2493a8826
-s ours am: 184d58aa2e
-s ours am: e8db3f117a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/13738545
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I166ad4946ba509e5a7d182987a97759a1e45186b
2021-03-02 21:51:25 +00:00
Bill Yi
e8db3f117a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e2493a8826
-s ours am: 184d58aa2e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/13738545
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2e5682b48dce4844a76854444bea010a172ac755
2021-03-02 20:39:32 +00:00
Bill Yi
184d58aa2e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e2493a8826
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/13738545
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7b25e1fdca17fe707bc973ee59d6515704cea57c
2021-03-02 19:47:02 +00:00
Bill Yi
e2493a8826
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I4bd0823ba40291cdea81a06aa589a2f4d70e5787
2021-03-02 00:26:25 -08:00
Treehugger Robot
360e59dc14
[automerger skipped] Merge "Update ImageGenerator to match the latest font names." am: 2fb99930fc
am: 4de32b2fb2
am: 9dc8ca5a41
-s ours am: 536541250f
-s ours
...
am skip reason: Change-Id Ie1e2f9ee85625216be6b2cb0781df34faec97673 with SHA-1 0a4e828357
is in history
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1607136
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8640e934636a0139199ab37240d626112eebe8f4
2021-03-01 17:12:03 +00:00
Treehugger Robot
586e8c431e
[automerger skipped] Merge "Update ImageGenerator to match the latest font names." am: 2fb99930fc
am: 4de32b2fb2
am: 9dc8ca5a41
-s ours am: 536541250f
-s ours
...
am skip reason: Change-Id Ie1e2f9ee85625216be6b2cb0781df34faec97673 with SHA-1 0a4e828357
is in history
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1607136
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7cb1f1d7e4a36b6f902bb64fc92d44ea36c4917d
2021-03-01 08:18:52 +00:00
Treehugger Robot
536541250f
[automerger skipped] Merge "Update ImageGenerator to match the latest font names." am: 2fb99930fc
am: 4de32b2fb2
am: 9dc8ca5a41
-s ours
...
am skip reason: Change-Id Ie1e2f9ee85625216be6b2cb0781df34faec97673 with SHA-1 0a4e828357
is in history
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1607136
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I38368afb55f0b0656ebd78d3a4f5c861461cb1d9
2021-03-01 08:13:25 +00:00
Bill Yi
d8798ba2d2
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ib0763b29871228662c64c51763b796a949bc66e4
2021-02-27 01:20:15 -08:00
Treehugger Robot
9dc8ca5a41
Merge "Update ImageGenerator to match the latest font names." am: 2fb99930fc
am: 4de32b2fb2
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1607136
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I6748c3e0ec2029300e8be95f91aae453b43f0902
2021-02-26 19:12:26 +00: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
631bb1cbe8
Merge "Switch care_map_generator.py to Python 3." am: f2e577eda8
am: 79f73eea4b
am: 57b8f5b320
am: 8a1580499f
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1606758
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Idb5340db936ffc98244c80d289aecbd5900d3a7a
2021-02-26 04:17:01 +00:00
Treehugger Robot
062630064d
Merge "Switch care_map_generator.py to Python 3." am: f2e577eda8
am: 79f73eea4b
am: 57b8f5b320
am: 8a1580499f
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1606758
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4aafbe5b272d244bd967a5c54d7b0e0d59de108c
2021-02-26 04:15:29 +00:00
Treehugger Robot
8a1580499f
Merge "Switch care_map_generator.py to Python 3." am: f2e577eda8
am: 79f73eea4b
am: 57b8f5b320
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1606758
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I9bdaa66a39f53d5eaa7dbcafc071e0d64604aa7c
2021-02-26 03:43:13 +00:00
Treehugger Robot
57b8f5b320
Merge "Switch care_map_generator.py to Python 3." am: f2e577eda8
am: 79f73eea4b
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1606758
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7a060dc53993f258a0bc871adc5fed3d98bff6d4
2021-02-26 02:00:39 +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
TreeHugger Robot
2ac9ca1eed
Merge "Update ImageGenerator to match the latest font names." into sc-dev am: 2e72f0af9d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/13549759
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0cb1987f0cef7ebcdfb620126f86abb13f585795
2021-02-24 21:17:18 +00:00
TreeHugger Robot
febd3b090d
Merge "Update ImageGenerator to match the latest font names." into sc-dev am: 2e72f0af9d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/13549759
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iec530f494ebcb06ef217ce7345b007f540af9a68
2021-02-24 21:16:54 +00:00
TreeHugger Robot
2e72f0af9d
Merge "Update ImageGenerator to match the latest font names." into sc-dev
2021-02-24 20:00:16 +00:00
Xin Li
724444c293
[automerger skipped] Merge ab/7061308 into stage. am: fea7439a2e
-s ours am: 8d12226c10
-s ours am: e8354919b0
-s ours
...
am skip reason: Change-Id I6551a7e630f7fd33d2083e939b503d3f52d8a4cc with SHA-1 049745c912
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/13657301
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic27161d13c2283eb560d122d03c12db427dee7c3
2021-02-23 11:35:16 +00:00
Xin Li
f9eb2ef70d
[automerger skipped] Merge ab/7061308 into stage. am: fea7439a2e
-s ours am: 8d12226c10
-s ours am: e8354919b0
-s ours
...
am skip reason: Change-Id I6551a7e630f7fd33d2083e939b503d3f52d8a4cc with SHA-1 049745c912
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/13657301
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Icae7de4e7e4b3514e9848af4552f8f1bf65928a4
2021-02-23 11:30:44 +00:00
Xin Li
e8354919b0
[automerger skipped] Merge ab/7061308 into stage. am: fea7439a2e
-s ours am: 8d12226c10
-s ours
...
am skip reason: Change-Id I6551a7e630f7fd33d2083e939b503d3f52d8a4cc with SHA-1 049745c912
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/13657301
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1e1d4d4d6de7c74f0126b621bc20ef202a29b7d9
2021-02-23 10:34:10 +00:00
Xin Li
8d12226c10
[automerger skipped] Merge ab/7061308 into stage. am: fea7439a2e
-s ours
...
am skip reason: Change-Id I6551a7e630f7fd33d2083e939b503d3f52d8a4cc with SHA-1 049745c912
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/13657301
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8fb7e3130e1e9e52bb3da6eb1a11cc36c1c7eb75
2021-02-23 09:05:06 +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
474f202e6d
Merge "updater: Do not null terminate mount_flags_list array" am: be54337fab
am: 44cea7efc8
am: ef49826256
am: d22186e4b3
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1590176
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia383d9118eccc1391c3ed5353ae9a24823415140
2021-02-17 21:45:27 +00:00
Tianjie Xu
df7e138f01
Merge "updater: Do not null terminate mount_flags_list array" am: be54337fab
am: 44cea7efc8
am: ef49826256
am: d22186e4b3
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1590176
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I50f751593ffaf37d129c0f0ed400fb499d806c63
2021-02-17 21:45:04 +00:00
Tianjie Xu
d22186e4b3
Merge "updater: Do not null terminate mount_flags_list array" am: be54337fab
am: 44cea7efc8
am: ef49826256
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1590176
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id1ca98bbad9a75c4ea6243627f286f3f3613d515
2021-02-17 21:07:37 +00:00
Tianjie Xu
ef49826256
Merge "updater: Do not null terminate mount_flags_list array" am: be54337fab
am: 44cea7efc8
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1590176
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia7395d42331d907ec10c6a4ca047a8c3f968afc6
2021-02-17 20:43:36 +00: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
b1d2e32e48
Merge "[LSC] Add LOCAL_LICENSE_KINDS to bootable/recovery" am: 1055a2f07a
am: d9a0aa10ba
am: d2b1584e7f
am: 39e0f59573
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1589034
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If72100c1bc38b6c4f4a31bc78c8802f2c071f696
2021-02-16 20:11:26 +00:00
Treehugger Robot
f4ea3d37c9
Merge "[LSC] Add LOCAL_LICENSE_KINDS to bootable/recovery" am: 1055a2f07a
am: d9a0aa10ba
am: d2b1584e7f
am: 39e0f59573
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1589034
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie4b685cb4c7a6fb56048a0d389b32baa4f58f267
2021-02-16 20:08:07 +00:00
Treehugger Robot
39e0f59573
Merge "[LSC] Add LOCAL_LICENSE_KINDS to bootable/recovery" am: 1055a2f07a
am: d9a0aa10ba
am: d2b1584e7f
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1589034
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I9f490244e12cb73a2badde240f95a08e5d2021fe
2021-02-16 19:41:13 +00:00
Treehugger Robot
d2b1584e7f
Merge "[LSC] Add LOCAL_LICENSE_KINDS to bootable/recovery" am: 1055a2f07a
am: d9a0aa10ba
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1589034
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I39524dd752d8271a905f873310e1a978350d18d3
2021-02-16 18:48:18 +00: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
7549d9ccf7
Merge "recovery: don't mount acct" am: c136106159
am: ffa2392e12
am: 6bec01999a
am: 07a764a867
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1584437
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4bf3ef67b4c94c9bbf2e96994ce1e8f669c02371
2021-02-13 23:28:39 +00:00
Treehugger Robot
73b5e7c31a
Merge "recovery: don't mount acct" am: c136106159
am: ffa2392e12
am: 6bec01999a
am: 07a764a867
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1584437
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I706350393fa4e0ec89486b1b3f1c1a87fe93f44c
2021-02-13 23:28:05 +00:00
Treehugger Robot
07a764a867
Merge "recovery: don't mount acct" am: c136106159
am: ffa2392e12
am: 6bec01999a
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1584437
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5a8add214e86810f8004c5a925b78ec58e22260f
2021-02-13 23:00:31 +00:00
Treehugger Robot
6bec01999a
Merge "recovery: don't mount acct" am: c136106159
am: ffa2392e12
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1584437
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2fa9aea1f7f2ea55bd9caf4c7946493e1426e3cb
2021-02-13 22:21:54 +00: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