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
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
610a9fe994
Merge "Revert "recovery: fix UI error when directories too many [1/1]"" into main am: 1fb40d753a
am: e47edd1eae
am: 91e622f1ad
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2823390
Change-Id: I7e4946ee5060cbadc8a6619995318ea6f2c0ac93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-09 04:04:45 +00:00
Ben Fennema
f83eaeb49c
Merge "Fix removal of fastbootd logo for wear" into main am: 6de5720bf7
am: 6882863878
am: e884087b76
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2823470
Change-Id: I52083d105d7fb2bdc3b3099e4a5f47a176950627
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-09 04:04:10 +00:00
Ben Fennema
936e13d4fd
Merge "Revert "recovery: fix UI error when directories too many [1/1]"" into main am: 1fb40d753a
am: 4b9611592a
am: 56728e6c47
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2823390
Change-Id: I962180ed7be50496f521a7bee247b46a92575780
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-09 04:01:22 +00:00
Ben Fennema
236665f7cd
Merge "Fix removal of fastbootd logo for wear" into main am: 6de5720bf7
am: 6dcb48b30d
am: 3d8bcba753
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2823470
Change-Id: Ie7810958ac48ad62262649f3898b8225ed4b33b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-09 03:57:34 +00:00
Ben Fennema
91e622f1ad
Merge "Revert "recovery: fix UI error when directories too many [1/1]"" into main am: 1fb40d753a
am: e47edd1eae
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2823390
Change-Id: I3cee58b688390a79f1811c217132c777de2c342d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-09 03:15:00 +00:00
Ben Fennema
e884087b76
Merge "Fix removal of fastbootd logo for wear" into main am: 6de5720bf7
am: 6882863878
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2823470
Change-Id: I3d0847fa6a27aa0e0a6123c01afc0ead125983ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-09 03:12:59 +00:00
Ben Fennema
56728e6c47
Merge "Revert "recovery: fix UI error when directories too many [1/1]"" into main am: 1fb40d753a
am: 4b9611592a
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2823390
Change-Id: I212fe939b360abd9d8b879404207103481c5b6b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-09 03:12:19 +00:00
Ben Fennema
3d8bcba753
Merge "Fix removal of fastbootd logo for wear" into main am: 6de5720bf7
am: 6dcb48b30d
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2823470
Change-Id: Ia58739cb52944348003ebe8553190c7922277eab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-09 03:11:43 +00:00
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