Commit graph

11468 commits

Author SHA1 Message Date
Treehugger Robot
5db49a357d Merge "Reland "Only format /data in recovery if user specified a new fstype"" into main 2024-01-13 22:30:51 +00:00
Kelvin Zhang
aa0a88def3 Reland "Only format /data in recovery if user specified a new fstype"
This reverts commit c89b4e4314.

Reason for revert: reland the feature with bug fixed

Bug: 293313353
Test: Enter recovery with data wipe command

Change-Id: I2e1cfb91966c1af0145aac43cf11629cef9380d2
2024-01-13 13:51:57 -08:00
Treehugger Robot
f554b33bb9 Merge "Revert "Only format /data in recovery if user specified a new fstype"" into main 2024-01-11 04:00:54 +00:00
Dan Shi
c89b4e4314 Revert "Only format /data in recovery if user specified a new fstype"
This reverts commit 765172c709.

Reason for revert: b/319516268

Change-Id: I974722fb433f20c57b9535fef2e28a78acbc1931
2024-01-11 02:46:37 +00:00
Treehugger Robot
d0867b54f3 Merge "Only format /data in recovery if user specified a new fstype" into main 2024-01-10 21:45:13 +00:00
Kelvin Zhang
765172c709 Only format /data in recovery if user specified a new fstype
recovery mode does not have key services, so formatting volumes in
recovery would result in an unencrypted image.
If init detects an unencrypted /data image, encrypt_inplace would be
called. We would like to avoid using `encrypt_inplace` in production.
So do not format /data in recovery for regular data wipes.

Test: th
Bug: 293313353
Change-Id: I401da2a876ed22b426872c80c231397c12ec0737
2024-01-10 10:43:04 -08:00
Elliott Hughes
64e3bde459 Merge "Fix the problem of incremental OTA upgrade failure (recovery part)" into main 2024-01-08 22:22:51 +00:00
luoqiangwei1
2fb4c66b59 Fix the problem of incremental OTA upgrade failure (recovery part)
When the updater compresses the file after the apply patch, unexpected results are generated, resulting in the failure of incremental OTA upgrade

Test: make imgdiff updater
Change-Id: I0d7652dca46c5b027f22670b254332fb8a5d5c98
Signed-off-by: luoqiangwei1 <luoqiangwei1@xiaomi.com>
2024-01-08 20:19:35 +00:00
Treehugger Robot
c7fad9a77c Merge "Add recovery flag to reformat /data" into main 2024-01-05 17:54:14 +00:00
Kelvin Zhang
735499480d Add recovery flag to reformat /data
For 16K dev options, we might need to reformat /data partition as ext4
before enabling the feature. Add necessary support to recovery.

Test: Trigger reboot with --wipe_data --reformat_data=ext4, make sure
/data is reformatted with ext4 on next boot
Bug: 293313353

Change-Id: I3cb67a62635a2df578472cd48cf6d2f5e04b5f82
2024-01-04 16:43:53 -08: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
74c6581ac5 Merge "Update recovery to use Health AIDL HAL V3." into main 2023-12-12 04:00:50 +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