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

11651 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ben Fennema
e47edd1eae Merge "Revert "recovery: fix UI error when directories too many [1/1]"" into main am: 1fb40d753a 
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2823390

Change-Id: I8c1fbc879f4d2af1806fa90576c2a3f0a003466b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-09 02:42:15 +00:00
Ben Fennema
6882863878 Merge "Fix removal of fastbootd logo for wear" into main am: 6de5720bf7 
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2823470

Change-Id: If38b9bbb823a72c8c689b39ac102cb169460ff29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-09 02:41:20 +00:00
Ben Fennema
4b9611592a Merge "Revert "recovery: fix UI error when directories too many [1/1]"" into main am: 1fb40d753a 
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2823390

Change-Id: If9efd8b9534c82bd65a32d190af2b0e95cfed0ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-09 02:38:58 +00:00
Ben Fennema
6dcb48b30d Merge "Fix removal of fastbootd logo for wear" into main am: 6de5720bf7 
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2823470

Change-Id: I29cb27cf1c492f8fc3f006081262880cc35db612
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-09 02:37:22 +00:00
Ben Fennema
1fb40d753a Merge "Revert "recovery: fix UI error when directories too many [1/1]"" into main 2023-11-09 02:08:11 +00:00
Ben Fennema
3cd6491a22 Revert "recovery: fix UI error when directories too many [1/1]" 
This reverts commit 159a5473a2.

Reason for revert: This breaks menu scrolling on wear devices
Bug: 309813434

Change-Id: If68683fcef0e9689fa6cfea1af5aab559f99fb3a
 2023-11-09 02:07:25 +00:00
Ben Fennema
6de5720bf7 Merge "Fix removal of fastbootd logo for wear" into main 2023-11-09 02:07:01 +00:00
Ben Fennema
4022a1deb8 Fix removal of fastbootd logo for wear 
Move SetEnableFastbootdLogo() into StartFastboot() for !IsWearable().

Bug: 309820589
Change-Id: I01a97026812cd9960a71d95ea30b46e5ba5c9675
Signed-off-by: Ben Fennema <fennema@google.com>
 2023-11-08 14:15:52 -08:00
Treehugger Robot
df90da143b Merge "Add --keep_memtag_mode for --wipe_data" into main am: 0d4e8c333c am: f5094dfc30 am: 0abd6e6dbc 
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2810434

Change-Id: I80c78ee07e08dd8ccb883f6625c087e3311ba6e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-31 11:55:01 +00:00
Treehugger Robot
c6aabd4c5b Merge "Add --keep_memtag_mode for --wipe_data" into main am: 0d4e8c333c am: f8d48e1846 am: 362b11461d 
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2810434

Change-Id: I4806d95550ae9998af5958e623eee65b2a0edc95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-31 11:54:32 +00:00
Treehugger Robot
0abd6e6dbc Merge "Add --keep_memtag_mode for --wipe_data" into main am: 0d4e8c333c am: f5094dfc30 
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2810434

Change-Id: Ibaaf949d992f96c7bc798ba8d9964d912a520989
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-31 11:17:41 +00:00
Treehugger Robot
362b11461d Merge "Add --keep_memtag_mode for --wipe_data" into main am: 0d4e8c333c am: f8d48e1846 
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2810434

Change-Id: Iee895c10dfe9f26c7f49c43101d1a3a49b09c741
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-31 11:15:43 +00:00
Treehugger Robot
f5094dfc30 Merge "Add --keep_memtag_mode for --wipe_data" into main am: 0d4e8c333c 
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2810434

Change-Id: Ieea6bb2cf0d78172c869432aa577e2d1f1cfed79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-31 10:51:38 +00:00
Treehugger Robot
f8d48e1846 Merge "Add --keep_memtag_mode for --wipe_data" into main am: 0d4e8c333c 
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2810434

Change-Id: I6bb9892a11e5d9d8fb5ef46d6788d4ca0c9d768d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-31 10:49:30 +00:00
Treehugger Robot
0d4e8c333c Merge "Add --keep_memtag_mode for --wipe_data" into main 2023-10-31 10:13:30 +00:00
Florian Mayer
0feef55859 Add --keep_memtag_mode for --wipe_data 
This allows us to erase the system image without resetting the MTE
state. This is useful for TestHarness looking to re-use an MTE enabled
device without incurring an extra reboot to re-enable after reboot.

Bug: 300694575
Change-Id: Ie1ea6891361e561189b9390b97b0b4a4c3a6d7e8
 2023-10-30 17:42:31 +00:00
Treehugger Robot
7b5068bb5e Merge "recovery: fix UI error when directories too many [1/1]" into main am: a57eebae81 am: cd42f12c21 am: fe8a688fb3 
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2786283

Change-Id: I60aaa96813f1b1fb2f1b4a03a42d8ebc82908d59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-27 11:03:40 +00:00
Treehugger Robot
5285a4dce4 Merge "recovery: fix UI error when directories too many [1/1]" into main am: a57eebae81 am: 42f35dbb26 am: 1b5b12558b 
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2786283

Change-Id: I23d94250b2058d5190eeb5bcf60ab91a7338438b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-27 11:03:26 +00:00
Treehugger Robot
fe8a688fb3 Merge "recovery: fix UI error when directories too many [1/1]" into main am: a57eebae81 am: cd42f12c21 
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2786283

Change-Id: If0bed8d7cec4a4338a36468a77771da8bd18d8b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-27 10:30:13 +00:00
Treehugger Robot
1b5b12558b Merge "recovery: fix UI error when directories too many [1/1]" into main am: a57eebae81 am: 42f35dbb26 
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2786283

Change-Id: I55709aaa19c2af01aec4711d30aa751f59ac78ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-27 10:28:34 +00:00
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
42f35dbb26 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: I6699663cc3719523c93cb992bb3d4b0ff83fd32d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-27 10:04:03 +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
11cc36d907 Merge "MinADB: Companion CL to deprecate tMsg" into main am: 8028425445 am: 1e5602afcb am: c7d0321b32 
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2797968

Change-Id: I8f83cbdc08fc1c03736f39ceafc6eebc9d4bd22c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-23 18:04:53 +00:00
Fabien Sanglard
52b217d4de Merge "MinADB: Companion CL to deprecate tMsg" into main am: 8028425445 am: 43ec749931 am: 32e7fddb66 
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2797968

Change-Id: I1cfdfe3453b1546ed1043830781ef6269595ded6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-23 18:04:09 +00:00
Fabien Sanglard
c7d0321b32 Merge "MinADB: Companion CL to deprecate tMsg" into main am: 8028425445 am: 1e5602afcb 
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2797968

Change-Id: I9e04695195b9d9896e772a516d3e87643bbb689f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-23 17:39:16 +00:00
Fabien Sanglard
32e7fddb66 Merge "MinADB: Companion CL to deprecate tMsg" into main am: 8028425445 am: 43ec749931 
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2797968

Change-Id: Ic36c38a25a0bec220a129bb39d921f5ce39c8677
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-23 17:37:09 +00: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
43ec749931 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: I913a621a48b258c561735edd2f00ae0fffbecfe6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-23 17:18:57 +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
62329c8f60 [automerger skipped] Merge 10952656 am: cbf450e563 -s ours am: 1200b4c0a1 -s ours 
am skip reason: Merged-In I5b0c0a0f06c7b2262f644012f2c52c171df03814 with SHA-1 0f5ed6884e is already in history

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

Change-Id: Ic1f400d30cb7b1db00cecd5d4fd42d94f5c59f2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-19 23:54:27 +00:00
Xin Li
1200b4c0a1 [automerger skipped] Merge 10952656 am: cbf450e563 -s ours 
am skip reason: Merged-In I5b0c0a0f06c7b2262f644012f2c52c171df03814 with SHA-1 0f5ed6884e is already in history

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

Change-Id: I263a2b9b807878ccc8cd3b561557c9df55143e29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-19 18:47:41 +00:00
Xin Li
cbf450e563 Merge 10952656 
Merged-In: I5b0c0a0f06c7b2262f644012f2c52c171df03814
Change-Id: Ic199e5f8b04257f0da58b1a0060407516f9ca87f
 2023-10-17 10:05:50 -07:00
Xin Li
461dc25997 [automerger skipped] Merge "Merge Android 14" into main am: d5a9337bc5 -s ours am: 93ba033a58 -s ours am: c718f599a5 -s ours am: f4c95ddd11 -s ours am: 0f5ed6884e -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: Iadc4b0678945fefbf8946c1bac7685b179937377
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-07 00:24:18 +00:00
Xin Li
ed8ee25f1e [automerger skipped] Merge Android 14 am: d21ccbcad1 -s ours am: f8873de9eb -s ours am: efcde6af97 -s ours am: 956552d750 -s ours am: cf49ad57a1 -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: I234e92a1a83e456e477a076b17e4f95a33a35049
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-07 00:19:38 +00:00
Xin Li
0f5ed6884e [automerger skipped] Merge "Merge Android 14" into main am: d5a9337bc5 -s ours am: 93ba033a58 -s ours am: c718f599a5 -s ours am: f4c95ddd11 -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: I5b0c0a0f06c7b2262f644012f2c52c171df03814
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-06 11:04:47 +00:00
Xin Li
cf49ad57a1 [automerger skipped] Merge Android 14 am: d21ccbcad1 -s ours am: f8873de9eb -s ours am: efcde6af97 -s ours am: 956552d750 -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: I80b3f6a32ade68b2db8dbf2b5f10e5721a20ae30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-06 11:00:08 +00:00
Xin Li
f4c95ddd11 [automerger skipped] Merge "Merge Android 14" into main am: d5a9337bc5 -s ours am: 93ba033a58 -s ours am: c718f599a5 -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: I630655f97e83ee0cc40a59682e25d0d0cadf73f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-06 09:54:56 +00:00
Xin Li
956552d750 [automerger skipped] Merge Android 14 am: d21ccbcad1 -s ours am: f8873de9eb -s ours am: efcde6af97 -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: Id3b653efea44cb9cb2961b1fb25452124438310b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-06 09:50:17 +00: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
6dd667aa5f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bbd55477b9 -s ours am: 10a02c95a7 -s ours am: 616b086e61 -s ours am: 8d15b192c7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I35d7370ea48ea37ebcdb92b2720bf2cd261c1b13
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-31 23:43:27 +00:00
Bill Yi
8d15b192c7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bbd55477b9 -s ours am: 10a02c95a7 -s ours am: 616b086e61 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I045aaab652017f8e7b1aa387c884dbc1dbeb156e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-31 22:40:44 +00:00
Bill Yi
616b086e61 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bbd55477b9 -s ours am: 10a02c95a7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I07442280b521e0240640a3d2700153530c05200e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-31 21:51:44 +00:00