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

11710 commits

This branch
This branch
All branches
Author SHA1 Message Date
Treehugger Robot
199b710686 Merge "Reland "Only format /data in recovery if user specified a new fstype"" into main am: 5db49a357d am: fdcc28ebf5 
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2909199

Change-Id: I09617b1abebc27879dba75dcf528fd89863eabe9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-01-13 23:42:52 +00:00
Treehugger Robot
fdcc28ebf5 Merge "Reland "Only format /data in recovery if user specified a new fstype"" into main am: 5db49a357d 
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2909199

Change-Id: I1399bb7b5d57507a9fce323fc07f734f14c97bc5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-01-13 23:12:38 +00:00
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
Alice Ryhl
a4aec2f2ce Add kcmdline bootloader message 
Define a new struct in the misc partition for telling the bootloader to
set kcmdline flags for enabling experimental dogfood features in the
kernel.

Test: Verified that a custom bootloader is able to read the data
Bug: 278052745
Change-Id: I5f13a9bdff940517cb7b880815dfb8f396fc3844
Signed-off-by: Alice Ryhl <aliceryhl@google.com>
 2024-01-12 13:36:09 +00:00
Treehugger Robot
29488e4274 Merge "Revert "Only format /data in recovery if user specified a new fstype"" into main am: f554b33bb9 am: b1d235a119 am: 4fb369aae7 
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2905428

Change-Id: I60bc0240e6603cec519e964217e1d7b25e8420f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-01-11 06:17:26 +00:00
Treehugger Robot
4fb369aae7 Merge "Revert "Only format /data in recovery if user specified a new fstype"" into main am: f554b33bb9 am: b1d235a119 
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2905428

Change-Id: Ib1e564e7e4f9f1bac59df26f3f39ed6c5c51116c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-01-11 05:25:25 +00:00
Treehugger Robot
b1d235a119 Merge "Revert "Only format /data in recovery if user specified a new fstype"" into main am: f554b33bb9 
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2905428

Change-Id: Ie0c801cf56dac9e059fbe0119d810dc2b7e5d51c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-01-11 04:40:10 +00: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
a252ebd232 Merge "Only format /data in recovery if user specified a new fstype" into main am: d0867b54f3 am: f4c94f692d am: fd103cf5a5 
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2903355

Change-Id: I844452c4378c1d2fa333141533e944fcc33e0430
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-01-11 00:37:44 +00:00
Treehugger Robot
fd103cf5a5 Merge "Only format /data in recovery if user specified a new fstype" into main am: d0867b54f3 am: f4c94f692d 
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2903355

Change-Id: I037a02782ad9574196c71e8da4e045a723123570
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-01-10 23:48:00 +00:00
Treehugger Robot
f4c94f692d Merge "Only format /data in recovery if user specified a new fstype" into main am: d0867b54f3 
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2903355

Change-Id: I48be515090da4b43794835cee0f7875cacfe8ff9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-01-10 23:02:17 +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
04daca1e0d Merge "Fix the problem of incremental OTA upgrade failure (recovery part)" into main am: 64e3bde459 am: 81ce5cf3bf am: 036eb4a89d 
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2901147

Change-Id: I12c2c4ceefcf762f7fbe1a72f1fef2d302cf675d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-01-09 00:08:17 +00:00
Elliott Hughes
036eb4a89d Merge "Fix the problem of incremental OTA upgrade failure (recovery part)" into main am: 64e3bde459 am: 81ce5cf3bf 
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2901147

Change-Id: I73af8326b9406e4514a71f50fc1c975636a4f683
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-01-08 23:37:06 +00:00
Elliott Hughes
81ce5cf3bf Merge "Fix the problem of incremental OTA upgrade failure (recovery part)" into main am: 64e3bde459 
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2901147

Change-Id: I9f2cb75666ce9cf76fdeed3316c9b0c72590d320
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-01-08 23:07:39 +00: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
0aaa5af8aa Merge "Add recovery flag to reformat /data" into main am: c7fad9a77c am: 7390406dd1 am: a5c8b4e739 
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2898791

Change-Id: Idf6561986a243fdd7ca4b89d824bb26b837a4ecc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-01-05 19:54:00 +00:00
Treehugger Robot
a5c8b4e739 Merge "Add recovery flag to reformat /data" into main am: c7fad9a77c am: 7390406dd1 
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2898791

Change-Id: I3fef0c3a470dfafe8b73c93a512641a7115f57a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-01-05 19:21:38 +00:00
Treehugger Robot
7390406dd1 Merge "Add recovery flag to reformat /data" into main am: c7fad9a77c 
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2898791

Change-Id: I3358ae3c27caa88d8032e0ae6bfe0985f5ddb761
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-01-05 18:52:17 +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
649d91d739 Merge "updater_sample: tools: import AbOtaPropertyFiles from ota_utils" into main am: c117b7e495 am: 2caa07b8f4 am: 138bb18f3b 
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2837717

Change-Id: I8f19ff581dabbac7a6b2b4873ce861c22bcc0a81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-13 22:17:32 +00:00
Treehugger Robot
138bb18f3b Merge "updater_sample: tools: import AbOtaPropertyFiles from ota_utils" into main am: c117b7e495 am: 2caa07b8f4 
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2837717

Change-Id: I4f7c90538855b4821fbe7f73836381c93b20d1ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-13 21:44:25 +00:00
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
1b0f7acd6c Merge "Update recovery to use Health AIDL HAL V3." into main am: 74c6581ac5 am: f6f72ba97f am: 84f236dc27 
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2837349

Change-Id: Ie66a44cb41a6dd2a52c102ad3db50c08add69401
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-12 05:43:38 +00:00
David Anderson
84f236dc27 Merge "Update recovery to use Health AIDL HAL V3." into main am: 74c6581ac5 am: f6f72ba97f 
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2837349

Change-Id: I2b682880506b4f157923915b78b155ac1472dd3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-12 05:09:30 +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
1d0e31fbf2 [automerger skipped] Merge "Merge Android 14 QPR1" into main am: 38ed74d141 -s ours am: aff8f0072e -s ours am: fa7a73f845 -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: Ibadef99300e764d7d68ca915891253fa979d3f51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-11 23:00:20 +00:00
Xin Li
bfec1f696a [automerger skipped] Merge Android 14 QPR1 am: 32439b486b -s ours am: 0835b26721 -s ours am: 82440cf3c8 -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: I7eb78c8aaf2e578b49db2797d5b643f8192b4394
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-11 22:57:28 +00:00
Xin Li
fa7a73f845 [automerger skipped] Merge "Merge Android 14 QPR1" into main am: 38ed74d141 -s ours am: aff8f0072e -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: I2aded6c1e64baa64d61e6a7ab9d989b394e3275a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-11 22:05:05 +00:00
Xin Li
82440cf3c8 [automerger skipped] Merge Android 14 QPR1 am: 32439b486b -s ours am: 0835b26721 -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: Ic149ca8e1b696c779cedf54dfe814b18daadc1ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-11 22:02:15 +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
c3cdb632e1 Merge "support wrist orientation in recovery/fastbootd" into main am: 9a3616d25f am: 147d51e74d am: da0188173a 
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2824654

Change-Id: Ibac41b9f4c8e425195ee64c0fcdce4136aa5cd5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-16 09:57:35 +00:00
Treehugger Robot
24eb364d3c Merge "support wrist orientation in recovery/fastbootd" into main am: 9a3616d25f am: 3d806cad7a am: 471985c5d6 
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2824654

Change-Id: I5a77b0e8a85c75eb109228a5a26f4b5655d82b12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-16 09:55:52 +00:00
Treehugger Robot
da0188173a Merge "support wrist orientation in recovery/fastbootd" into main am: 9a3616d25f am: 147d51e74d 
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2824654

Change-Id: Ib293aa51786fc6db845cbae1872d34e46315d51f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-16 09:24:36 +00:00
Treehugger Robot
471985c5d6 Merge "support wrist orientation in recovery/fastbootd" into main am: 9a3616d25f am: 3d806cad7a 
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2824654

Change-Id: Ide88231b32299721cfd1504c1cdeac28d89fdd83
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-16 09:22:37 +00:00
Treehugger Robot
147d51e74d 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: Ia576934ee206837f250dd058a017b6260bc7c6f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-16 08:52:06 +00: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