Commit graph

11462 commits

Author SHA1 Message Date
Treehugger Robot
2caa07b8f4 Merge "updater_sample: tools: import AbOtaPropertyFiles from ota_utils" into main am: c117b7e495
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2837717

Change-Id: Ib0bed3fce375747bf7b8117abba9fc19b6aceec3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-13 21:13:54 +00:00
Treehugger Robot
c117b7e495 Merge "updater_sample: tools: import AbOtaPropertyFiles from ota_utils" into main 2023-12-13 20:30:55 +00:00
David Anderson
f6f72ba97f Merge "Update recovery to use Health AIDL HAL V3." into main am: 74c6581ac5
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2837349

Change-Id: I7b0141f4f191bdea2e66b3e5635bb1506fae6673
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-12 04:38:55 +00:00
David Anderson
74c6581ac5 Merge "Update recovery to use Health AIDL HAL V3." into main 2023-12-12 04:00:50 +00:00
Xin Li
aff8f0072e [automerger skipped] Merge "Merge Android 14 QPR1" into main am: 38ed74d141 -s ours
am skip reason: Merged-In I11e0149ab9cb67c975fea95e93957f609c143e5f with SHA-1 3d806cad7a is already in history

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

Change-Id: I532b7ef2bed755d8cde96328b25f20c7a3d9fd78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11 21:19:22 +00:00
Xin Li
0835b26721 [automerger skipped] Merge Android 14 QPR1 am: 32439b486b -s ours
am skip reason: Merged-In I11e0149ab9cb67c975fea95e93957f609c143e5f with SHA-1 3d806cad7a is already in history

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

Change-Id: I1d00ecd216fdedec964f325c1f08e7392627bb38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11 21:16:25 +00:00
Xin Li
38ed74d141 Merge "Merge Android 14 QPR1" into main 2023-12-09 00:11:57 +00:00
Xin Li
32439b486b Merge Android 14 QPR1
Merged-In: I11e0149ab9cb67c975fea95e93957f609c143e5f
Bug: 315507370
Change-Id: I06360db78f34fc27429b9544e1457fc091fe2da7
2023-12-08 13:13:06 -08:00
Mattijs Korpershoek
446593482f updater_sample: tools: import AbOtaPropertyFiles from ota_utils
Commit [1] moved the AbOtaPropertyFiles class from the ota_from_target_files
file to the ota_utils file.

Because of this move, running gen_update_config.py breaks:
AttributeError: module 'ota_from_target_files' has no attribute 'AbOtaPropertyFiles'

Fix the error by importing from ota_utils instead of from
ota_from_target_files.

[1] https://android-review.googlesource.com/c/platform/build/+/2201755
Change-Id: Ife3d26bdfdeedf26888cd311ed490edf73c103da
Signed-off-by: Mattijs Korpershoek <mkorpershoek@baylibre.com>
2023-12-05 09:10:27 +01:00
David Anderson
8ee048d750 Update recovery to use Health AIDL HAL V3.
Bug: 309792384
Test: m
Change-Id: I253dbee446c88e6a18718cedec090c3be1b56cfd
2023-11-17 20:39:19 -08:00
Treehugger Robot
3d806cad7a Merge "support wrist orientation in recovery/fastbootd" into main am: 9a3616d25f
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2824654

Change-Id: I11e0149ab9cb67c975fea95e93957f609c143e5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-16 08:51:49 +00:00
Treehugger Robot
9a3616d25f Merge "support wrist orientation in recovery/fastbootd" into main 2023-11-16 08:16:45 +00:00
Ludvig Hansson
510589f39e support wrist orientation in recovery/fastbootd
Add support for wrist orientation in recovery. Feature controlled by
the property "config.enable_wristorientation".

Read 'ro.boot.wrist_orientation' property to determine if screen
orientation should be flipped and swipes inverted.

Bug: 257123026
Bug: 309982093

Test: build boot/recovery
Test: recovery/fastbootd uses same orientation as android

Change-Id: I29e0e682cca81d302dae502382b6270afe105d72
2023-11-14 09:46:38 +01: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
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
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
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
cbf450e563 Merge 10952656
Merged-In: I5b0c0a0f06c7b2262f644012f2c52c171df03814
Change-Id: Ic199e5f8b04257f0da58b1a0060407516f9ca87f
2023-10-17 10:05:50 -07: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
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
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
f30a40558c [automerger skipped] Merge Android U (ab/10368041) am: 85045586f2 -s ours am: 94692daef5 -s ours am: f2a9ca55fb -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: I720d9318f29ab66e7c959fac7c2549a218cc532c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29 01:10:28 +00:00
Xin Li
f2a9ca55fb [automerger skipped] Merge Android U (ab/10368041) am: 85045586f2 -s ours am: 94692daef5 -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: I8621397781ebf61e7c2642332fd726b5c8121ebc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29 00:34:44 +00: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
577df889bd Merge "recovery: Fix old reference to libsnapshot_snapuserd." into main am: d52bdb8eae am: 5d80badc05 am: f700391b0c am: 4187344a8a
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2657755

Change-Id: I335edd98ea39b623247d206952e9f8cef327f746
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-04 23:18:07 +00:00
David Anderson
4187344a8a Merge "recovery: Fix old reference to libsnapshot_snapuserd." into main am: d52bdb8eae am: 5d80badc05 am: f700391b0c
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2657755

Change-Id: If34ad5b22e6444053577d6697deb5837221beb64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-04 22:33:23 +00: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