Treehugger Robot
cd42f12c21
Merge "recovery: fix UI error when directories too many [1/1]" into main am: a57eebae81
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2786283
Change-Id: I09756b7c1a3f2bb620349385ff25cc3fbca3d8e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-27 10:06:12 +00:00
Treehugger Robot
a57eebae81
Merge "recovery: fix UI error when directories too many [1/1]" into main
2023-10-27 09:45:00 +00:00
weifang.liu
159a5473a2
recovery: fix UI error when directories too many [1/1]
...
PD#SWPL-109807
PD#SWPL-140491
BUG=296817261
Problem:
UI error when directories too many
Solution:
check if select menu exceed screen size
Verify:
ohm
Change-Id: I4905a5766985aa5b9f59cd30613f4c90c07c16ab
Signed-off-by: Xindong Xu <xindong.xu@amlogic.com>
2023-10-25 09:46:47 +08:00
Fabien Sanglard
1e5602afcb
Merge "MinADB: Companion CL to deprecate tMsg" into main am: 8028425445
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2797968
Change-Id: I43aac21d59d509127008c8969e75266287a80826
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-23 17:19:59 +00:00
Fabien Sanglard
8028425445
Merge "MinADB: Companion CL to deprecate tMsg" into main
2023-10-23 17:01:04 +00:00
Fabien Sanglard
4baf92fb64
MinADB: Companion CL to deprecate tMsg
...
Fixes: 296247651
Test: Already covered
Change-Id: I0d300fba61f7256a82f8d48428fea8d26c83f8f3
2023-10-20 16:09:28 -07:00
Xin Li
c718f599a5
[automerger skipped] Merge "Merge Android 14" into main am: d5a9337bc5
-s ours am: 93ba033a58
-s ours
...
am skip reason: Merged-In If03b2db64c827e5027c4fcc96e11a40e171be256 with SHA-1 bbd55477b9
is already in history
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2776907
Change-Id: I8cd7e38795b00575e3a9c9b83036ceb399f843d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 09:03:09 +00:00
Xin Li
efcde6af97
[automerger skipped] Merge Android 14 am: d21ccbcad1
-s ours am: f8873de9eb
-s ours
...
am skip reason: Merged-In If03b2db64c827e5027c4fcc96e11a40e171be256 with SHA-1 bbd55477b9
is already in history
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2776907
Change-Id: I2ce532ed2094515b81e3650187185e3a943cc904
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 08:58:38 +00:00
Xin Li
93ba033a58
[automerger skipped] Merge "Merge Android 14" into main am: d5a9337bc5
-s ours
...
am skip reason: Merged-In If03b2db64c827e5027c4fcc96e11a40e171be256 with SHA-1 bbd55477b9
is already in history
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2776907
Change-Id: Ia71059ed42364bfdeeec9cffb5577e9e758d36f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 07:56:18 +00:00
Xin Li
f8873de9eb
[automerger skipped] Merge Android 14 am: d21ccbcad1
-s ours
...
am skip reason: Merged-In If03b2db64c827e5027c4fcc96e11a40e171be256 with SHA-1 bbd55477b9
is already in history
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2776907
Change-Id: If2ab69ee8a3418b257ed51ef5a6ad280ea6e607c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 07:51:36 +00:00
Xin Li
d5a9337bc5
Merge "Merge Android 14" into main
2023-10-06 05:34:27 +00:00
Xin Li
d21ccbcad1
Merge Android 14
...
Bug: 298295554
Merged-In: If03b2db64c827e5027c4fcc96e11a40e171be256
Change-Id: I109f9fdcf9d797b09165ea3b97a4e5ed78f4b957
2023-10-05 15:31:26 -07:00
Bill Yi
10a02c95a7
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bbd55477b9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/24613169
Change-Id: I6a53cad8cc5ad5714e5cac927a91fe13de511210
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-31 20:59:13 +00:00
Bill Yi
bbd55477b9
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: If03b2db64c827e5027c4fcc96e11a40e171be256
2023-08-30 19:25:13 -07:00
Xin Li
94692daef5
[automerger skipped] Merge Android U (ab/10368041) am: 85045586f2
-s ours
...
am skip reason: Merged-In If72db59d9df356d4c99a280faa0a49440fba316e with SHA-1 438997997c
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/24182566
Change-Id: I952cbe9ecd5e556eaeb314c6146655f6a8005eff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-28 23:58:45 +00:00
Xin Li
85045586f2
Merge Android U (ab/10368041)
...
Bug: 291102124
Merged-In: If72db59d9df356d4c99a280faa0a49440fba316e
Change-Id: Ie8c50607e59466119a6f736c39b704f524bf2902
2023-08-14 15:32:08 -07:00
David Anderson
f700391b0c
Merge "recovery: Fix old reference to libsnapshot_snapuserd." into main am: d52bdb8eae
am: 5d80badc05
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2657755
Change-Id: Ic2cabba05fe5fa81d47f716f465d1e4c33d27a98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-04 21:48:19 +00:00
David Anderson
5d80badc05
Merge "recovery: Fix old reference to libsnapshot_snapuserd." into main am: d52bdb8eae
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2657755
Change-Id: Ie3ad5bdafa423835352dd0e1aeff46fd9aaf78c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-04 21:06:47 +00:00
David Anderson
d52bdb8eae
Merge "recovery: Fix old reference to libsnapshot_snapuserd." into main
2023-08-04 20:14:54 +00:00
Bill Yi
5b4c0dfbbb
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6c8fb3fe72
-s ours am: e3ded1bab0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/24212909
Change-Id: I8af7f6e6ae74f9d6ac1c45f73432ba2133d29756
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28 05:20:46 +00:00
Bill Yi
e3ded1bab0
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6c8fb3fe72
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/24212909
Change-Id: Ia31e4b8bbb3f55acdd148ac88aa848bc455c627c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28 03:41:53 +00:00
Bill Yi
bb84907f83
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 686da02c37
-s ours am: 6065832835
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/24212910
Change-Id: I12aa45f8fa081daf6fdea4419df7e999155bfc62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 21:09:51 +00:00
Bill Yi
6065832835
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 686da02c37
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/24212910
Change-Id: I9f981bcdccf0702b08e3068964b099f1aa6f2c05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 21:06:43 +00:00
Bill Yi
df511932da
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fc8ec87f31
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/24213244
Change-Id: I53d618c0ffef5ef7b65b1be9300310ee31e4cc8b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 20:20:02 +00:00
Bill Yi
686da02c37
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ic59d43a5d1d0d099ea932f7349538f0bd5be6ae6
2023-07-26 10:47:16 -07:00
Bill Yi
fc8ec87f31
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Iaea9e9e243ded57c55189ac6b094ce4951efe3d3
2023-07-26 10:45:53 -07:00
Bill Yi
6c8fb3fe72
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I7b3bd66d3eb8a2879e8dcb118c0b18584e06eca8
2023-07-26 10:45:15 -07:00
Florian Mayer
6e222b158f
Merge "Add flag whether MTE state was forced" into main am: cf6676e15e
am: 90db0020b6
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2656836
Change-Id: I7655f7fd17d39151b6c785c3dfbd0456f50a4b3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-14 23:51:04 +00:00
Florian Mayer
90db0020b6
Merge "Add flag whether MTE state was forced" into main am: cf6676e15e
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2656836
Change-Id: I87bad089e42751275548a8dc0f81a73ba2e80c27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-14 22:38:04 +00:00
Florian Mayer
cf6676e15e
Merge "Add flag whether MTE state was forced" into main
2023-07-14 22:07:15 +00:00
Eric Biggers
9f1e980d3e
Merge "update_verifier: don't pass an unused command-line argument" into main am: 9910cbf8e0
am: 5dfa62d6af
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2653222
Change-Id: I46c498e72a7b2ca598ea717d05b5f7b8b27b9990
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-14 21:27:48 +00:00
Eric Biggers
5dfa62d6af
Merge "update_verifier: don't pass an unused command-line argument" into main am: 9910cbf8e0
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2653222
Change-Id: Idc48e7cca9874d94dc7d98b62b43874c54541c91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-14 20:42:23 +00:00
Eric Biggers
9910cbf8e0
Merge "update_verifier: don't pass an unused command-line argument" into main
2023-07-14 20:32:30 +00:00
Florian Mayer
9ff5549670
Add flag whether MTE state was forced
...
This will be used by mtectrl to remember whether the MTE state was
overriden using the force_on / force_off flags or set by the user. We
need that information when the force_on / force_off flag is reset.
Bug: 291106070
Change-Id: I6178f0b88b718e96e5c8ee39113848f422e5fb6d
2023-07-14 11:07:30 -07:00
David Anderson
1adca9c1aa
recovery: Fix old reference to libsnapshot_snapuserd.
...
Bug: 288273605
Test: builds
Change-Id: I4436f75e3a8481fae10e183d31d7e473d1dbbce1
2023-07-13 13:04:35 -07:00
Eric Biggers
0ce2b87528
update_verifier: don't pass an unused command-line argument
...
update_verifier is being passed the current stage of Full Disk
Encryption (FDE): "nonencrypted" or "${vold.decrypt}". However, since
FDE is no longer supported, it's actually now always "nonencrypted"
(which is confusing because there *is* encryption, it's just not FDE).
Also, update_verifier doesn't actually do anything with this
command-line argument, and based on the git history it never has.
Therefore, let's update the service definition to just have an
"update_verifier" service that passes no command-line argument.
Bug: 208476087
Test: presubmit
Change-Id: I8b62290360401024b6888c2e9488207d878d3f67
2023-07-12 16:58:24 +00:00
Chuong Hoang
825a34c678
Merge "Read brightness-related properties from ro.recovery.ui
" am: 1937b3fd30
am: 445fa201d9
am: 348895178c
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2646359
Change-Id: I9f899581e350540ce4175569f14cc347adb965db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-06 04:41:08 +00:00
Chuong Hoang
348895178c
Merge "Read brightness-related properties from ro.recovery.ui
" am: 1937b3fd30
am: 445fa201d9
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2646359
Change-Id: I02aa3caaa5e9c217f9e16d72fe1b486ef4083322
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-06 03:34:24 +00:00
Chuong Hoang
445fa201d9
Merge "Read brightness-related properties from ro.recovery.ui
" am: 1937b3fd30
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2646359
Change-Id: I75f4d1175be9e831f275e0a120b4d50f8eacafe7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-06 02:52:43 +00:00
Chuong Hoang
1937b3fd30
Merge "Read brightness-related properties from ro.recovery.ui
"
2023-07-06 02:23:16 +00:00
Chuong Hoang
0b6c017613
Read brightness-related properties from ro.recovery.ui
...
This allows configurable brightness levels and file paths through
BoardConfig.
Bug: 221048336
Test: brightness file paths and levels are successfully overwritten on
devices that don't use default values.
Change-Id: I357dc58b7b3d9784554c68cbb86fe345a5587735
2023-06-30 04:38:53 +00:00
Elliott Hughes
36524249e6
Merge "Use the hermetic gzip instead of minigzip." am: c4e7b82c44
am: ebb6d026f0
am: a8e558b721
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2631950
Change-Id: I65f0964bb5638b9a4efb92ee3a85e209020e2788
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-29 16:50:13 +00:00
Elliott Hughes
a8e558b721
Merge "Use the hermetic gzip instead of minigzip." am: c4e7b82c44
am: ebb6d026f0
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2631950
Change-Id: Ie7d7cf02df4553d396f2e0db7b2121d951bb04ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-29 16:05:31 +00:00
Elliott Hughes
ebb6d026f0
Merge "Use the hermetic gzip instead of minigzip." am: c4e7b82c44
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2631950
Change-Id: I9e9655813429a7e96c4b5f09cab363069da62fd5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-29 15:22:47 +00:00
Elliott Hughes
c4e7b82c44
Merge "Use the hermetic gzip instead of minigzip."
2023-06-29 14:23:54 +00:00
Elliott Hughes
da675a945f
Use the hermetic gzip instead of minigzip.
...
Bug: http://b/288169261
Test: treehugger
Change-Id: I7cb3d5468a79faedcae13d75913f11f5a8ea9e80
2023-06-21 10:10:42 -07:00
Abhishek Nigam
438997997c
Merge "Wear Recovery UI: Adjust for round screens" am: a7d1d0256c
am: 2b4e47be5a
am: 0f18ef7b4c
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2623222
Change-Id: If72db59d9df356d4c99a280faa0a49440fba316e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-16 05:27:51 +00:00
Abhishek Nigam
0f18ef7b4c
Merge "Wear Recovery UI: Adjust for round screens" am: a7d1d0256c
am: 2b4e47be5a
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2623222
Change-Id: Ia77ece295576cd3c5542b6a5200cd1e185d67b1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-16 04:38:08 +00:00
Abhishek Nigam
2b4e47be5a
Merge "Wear Recovery UI: Adjust for round screens" am: a7d1d0256c
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2623222
Change-Id: Ibb46a19cb1420a1cea952958b75a34b85b50d464
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-16 03:56:09 +00:00
Abhishek Nigam
a7d1d0256c
Merge "Wear Recovery UI: Adjust for round screens"
2023-06-16 03:10:14 +00:00