Jacky Liu
86df64785a
Merge "Move package verifier from libinstall to libotautil"
2021-12-24 14:27:38 +00:00
Jacky Liu
068329e977
Move package verifier from libinstall to libotautil
...
So it can be used by device-specific codes.
Bug: 184693830
Test: m; atest recovery_unit_test
Change-Id: I5885334c1bd04214c9cc295f2337306261a1735c
2021-12-22 23:31:08 +08:00
Yifan Hong
9113d57446
Merge "GetBatteryInfo() also reads AIDL health HAL." am: d33b067f04
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1906334
Change-Id: I5d7635ec6dc52f9349f7ebaed304f26fd445239f
2021-12-07 18:37:33 +00:00
Yifan Hong
d33b067f04
Merge "GetBatteryInfo() also reads AIDL health HAL."
2021-12-07 18:18:07 +00:00
Yifan Hong
67a8fd2175
GetBatteryInfo() also reads AIDL health HAL.
...
Test: call GetBatteryInfo manually with and without AIDL health HAL
Bug: 170338625
Bug: 177269435
Change-Id: I123739e5bc372d5198fd711f592ceac04d46ab28
2021-12-06 16:53:58 -08:00
Daeho Jeong
0e04a02326
Merge "Add erofs tools in recovery mode" am: 90064ac238
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1908036
Change-Id: I271a25b3d6ed67c1f14649a88f1ef18b512c66d4
2021-12-04 05:21:07 +00:00
Daeho Jeong
90064ac238
Merge "Add erofs tools in recovery mode"
2021-12-04 05:04:15 +00:00
Daeho Jeong
88cf074405
Add erofs tools in recovery mode
...
Bug: 201685920
Test: mm fsck.erofs
Signed-off-by: Daeho Jeong <daehojeong@google.com>
Change-Id: Ie9a4dcd28c4b6348f34859a9b4989ef1f29f787f
2021-12-03 19:37:56 +00:00
Treehugger Robot
4e6e027086
Merge "Use metadata_key_dir instead of metadata_encryption" am: 389e5c114d
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1908137
Change-Id: Ieb7f82d0f3531975ca06d88894610d4ead9dc52c
2021-12-02 22:58:35 +00:00
Treehugger Robot
389e5c114d
Merge "Use metadata_key_dir instead of metadata_encryption"
2021-12-02 22:39:45 +00:00
Jaegeuk Kim
fa95165300
Use metadata_key_dir instead of metadata_encryption
...
Eric pointed that metadata_key_dir is what specifies that metadata encryption
is enabled, whereas metadata_encryption is the metadata encryption options,
which don't have to be specified if the default options are sufficient.
Bug: 208161227
Fixes: 80a1d8e341
("Avoid to format raw disk if metadata encryption is enabled")
Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
Change-Id: I390450ba49c528b1f465c247d32174d36c7937a2
2021-12-02 20:57:39 +00:00
Treehugger Robot
744885a27a
Merge "Avoid to format raw disk if metadata encryption is enabled" am: 5bd36e04be
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1908136
Change-Id: I70a51a1f82f1af672d820fef48736275bce78e8d
2021-12-02 20:42:56 +00:00
Treehugger Robot
5bd36e04be
Merge "Avoid to format raw disk if metadata encryption is enabled"
2021-12-02 20:25:27 +00:00
Jaegeuk Kim
80a1d8e341
Avoid to format raw disk if metadata encryption is enabled
...
The current flow is
1. factory reset formatted raw disk.
2. next boot tries to convert it to metadata encryption
2.a mount sda27
2.b umount sda27
2.c encrypt_inplace()
2.d fsck on dm-x
2.e mount dm-x
The #2 flow is unnecessary, if we know the disk will be encrypted. And, that
gives a change of the failure when unmounting the raw disk by starting some
file operations on /data. That can cause the entire encryption failure.
Bug: 208161227
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
Change-Id: Iaedfeb74bb6abb667efee6dcadf8d66272466ee0
2021-12-02 10:54:25 -08:00
Yifan Hong
ab36e4a8c1
Merge changes from topic "servicemanager-recovery" am: 865cf90387
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1891078
Change-Id: Ib543ab2e641734d91ea87339995f50bbc10bae5b
2021-11-18 05:01:41 +00:00
Yifan Hong
71c4cce674
Start servicemanager on init in recovery mode. am: 8798099058
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1891533
Change-Id: I5cd28a92097078734f08a4a5e0f6bd837cf3577b
2021-11-18 05:01:38 +00:00
Yifan Hong
1033aafe6c
Mount binderfs and add /dev/binder in recovery. am: cb22b13418
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1891534
Change-Id: I3795c872d657e1bc6506ded9fd7b9b68cebe4d22
2021-11-18 05:01:37 +00:00
Yifan Hong
865cf90387
Merge changes from topic "servicemanager-recovery"
...
* changes:
on boot class_start hal
Start servicemanager on init in recovery mode.
Mount binderfs and add /dev/binder in recovery.
2021-11-18 04:39:14 +00:00
TreeHugger Robot
d4777b4401
Merge "Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918" into stage-aosp-master
2021-11-17 19:24:21 +00:00
Yifan Hong
8798099058
Start servicemanager on init in recovery mode.
...
This aligns with the behavior in normal boot,
where servicemanager is started on init.
Test: manual in recovery mode
Bug: 170338625
Change-Id: I91d322da9f6eaef21c7ee969375e63751b61513c
2021-11-17 10:14:41 -08:00
Yifan Hong
cb22b13418
Mount binderfs and add /dev/binder in recovery.
...
Test: recovery mode
Bug: 170338625
Change-Id: I6c64039b4139a48f739a62e15a26e624566d252c
2021-11-17 10:14:41 -08:00
Yifan Hong
0fa1707600
on boot class_start hal
...
Now that we have HALs in recovery, class_start hal
on boot trigger.
Test: manual
Bug: 170338625
Change-Id: Ibfaabb3573252b681279cf05bbf07f8776bd9063
2021-11-17 10:14:41 -08:00
Eric Biggers
1f3b2933f3
Merge "recovery_utils: remove FDE support" am: 60d8237ee4
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1886775
Change-Id: I4a8c6db052a2eaaf32a794a3b506b0d95b1d22bc
2021-11-10 19:10:41 +00:00
Eric Biggers
60d8237ee4
Merge "recovery_utils: remove FDE support"
2021-11-10 19:05:05 +00:00
Xin Li
84323a3a82
Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918
...
Bug: 205056467
Merged-In: Id217503f7f4423df25ae89eea305c2b2d3412a6a
Change-Id: I56d07533e37da2e302ed2cc7efcb3de52651e8cb
2021-11-10 08:05:29 +00:00
Eric Biggers
a762e14f03
recovery_utils: remove FDE support
...
Support for FDE is being removed from Android, having been replaced by
FBE. This CL removes the FDE-specific code from recovery_utils:
- Remove the code that wiped FstabEntry::key_loc if it is a block
device, since key_loc was only used by FDE.
- Remove support for reserving a crypto footer when formatting volumes,
since crypto footers were only used by FDE.
Bug: 191796797
Change-Id: I90b1e4cacd2f3e5cce77a82a0af744fcc7da9400
2021-11-09 17:20:32 -08:00
Treehugger Robot
a582cd483a
Merge "libminui for vendor" am: 67fb9e94d2
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1866413
Change-Id: I4b3f5c1190ed46d07c8c41c9a1b0b3e5cd2af030
2021-10-22 07:19:09 +00:00
Treehugger Robot
67fb9e94d2
Merge "libminui for vendor"
2021-10-22 07:04:02 +00:00
Yifan Hong
868aa50c2e
libminui for vendor
...
Build a static variant of libminui for vendor to use.
It depends on libdrm statically, and libsync from NDK.
This is needed to move charger to vendor partition.
Test: builds
Bug: 203246116
Change-Id: I0aa7783121502bef6ed98d9060a395931523b34c
2021-10-20 22:46:29 -07:00
Treehugger Robot
61707b973c
Merge "Update caremap to by py3 compatible" am: 18370833aa
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1855545
Change-Id: I9e1e721ebb31568b2917b306bd07631554172d94
2021-10-15 02:29:27 +00:00
Treehugger Robot
18370833aa
Merge "Update caremap to by py3 compatible"
2021-10-15 02:02:44 +00:00
Randall Huang
d679cbe825
Merge "Add fsck.f2fs to recovery mode" am: 2260b35d5a
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1854274
Change-Id: I19ccb007cefd358077f8e6efb34974063947d303
2021-10-13 05:16:53 +00:00
Randall Huang
2260b35d5a
Merge "Add fsck.f2fs to recovery mode"
2021-10-13 05:02:57 +00:00
Randall Huang
6a6a412686
Add fsck.f2fs to recovery mode
...
Bug: 202789846
Test: run factory data reset
Change-Id: Ief1fd480ac4c1aaaa3db85d153832e5311bf07e6
Signed-off-by: Randall Huang <huangrandall@google.com>
2021-10-13 03:12:22 +00:00
Kelvin Zhang
c88a1efca9
Update caremap to by py3 compatible
...
Py3 doesn't mix bytes/str, so be explicit about which one
Test: th
Change-Id: Ia091b8378da93f19c3eb7c944199163aa9c63de7
2021-10-12 15:02:32 -07:00
Treehugger Robot
1eb13afa06
Merge "Fix the fuse error that cannot handle the OTA package larger than 4 GiB" am: c9549c19ce
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1854273
Change-Id: I933e30627c57aa2ced11cfd57d8b1154bbb9d6f0
2021-10-12 18:43:20 +00:00
Treehugger Robot
c9549c19ce
Merge "Fix the fuse error that cannot handle the OTA package larger than 4 GiB"
2021-10-12 18:21:55 +00:00
luoqiangwei1
95b85a4dcb
Fix the fuse error that cannot handle the OTA package larger than 4 GiB
...
1. That read data will be blocked when adb sideload OTA package
2. An error(Out of bound read) occurs when installing OTA package by fuse
Test: as follows
- adb sideload OTA package
- install OTA package by install_with_fuse parameter
Change-Id: Ie53510d157f6ea4c92606b289fcb745d441918c8
Signed-off-by: luoqiangwei1 <luoqiangwei1@xiaomi.com>
2021-10-12 13:10:43 +08:00
Xin Li
3ba15f2799
[automerger skipped] Merge "Merge Android 12" am: 436a520a57
-s ours am: 60c3c08aa4
-s ours am: aaccc6518d
-s ours
...
am skip reason: Merged-In Iecc1012adcebfc5a10d865173cc01108f5394749 with SHA-1 fa27392f8a
is already in history
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1847353
Change-Id: Id217503f7f4423df25ae89eea305c2b2d3412a6a
2021-10-08 07:56:19 +00:00
Xin Li
aaccc6518d
[automerger skipped] Merge "Merge Android 12" am: 436a520a57
-s ours am: 60c3c08aa4
-s ours
...
am skip reason: Merged-In Iecc1012adcebfc5a10d865173cc01108f5394749 with SHA-1 fa27392f8a
is already in history
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1847353
Change-Id: I8f0c28fcf3ec2f7e26079318af10feaf2626787c
2021-10-08 01:39:04 +00:00
Xin Li
60c3c08aa4
[automerger skipped] Merge "Merge Android 12" am: 436a520a57
-s ours
...
am skip reason: Merged-In Iecc1012adcebfc5a10d865173cc01108f5394749 with SHA-1 fa27392f8a
is already in history
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1847353
Change-Id: I1d324fd336fa96c02539ae08351620b0736070ca
2021-10-08 01:19:38 +00:00
Xin Li
436a520a57
Merge "Merge Android 12"
2021-10-07 23:50:29 +00:00
Xin Li
d913b9d918
Merge Android 12
...
Bug: 202323961
Merged-In: Iecc1012adcebfc5a10d865173cc01108f5394749
Change-Id: I7d9f02d6ec2ed8015935d8c3634395750a12c58a
2021-10-06 22:51:43 +00:00
Treehugger Robot
fc87149c4d
Merge "Warn on repo upload
if you're not uploading to AOSP master." am: 026eb31f80
am: fa27392f8a
am: 361f8f4118
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1834836
Change-Id: I13dad035e3ae763f4acdcfb77e715671708d2a92
2021-09-23 23:06:05 +00:00
Treehugger Robot
00f28ca88b
Merge "Remove enh from OWNERS." am: 23db699634
am: 174562c83c
am: 9af1361162
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1834837
Change-Id: I760dccb08edbf35e900f9a8022bb9dd81b405eb5
2021-09-23 23:05:58 +00:00
Treehugger Robot
361f8f4118
Merge "Warn on repo upload
if you're not uploading to AOSP master." am: 026eb31f80
am: fa27392f8a
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1834836
Change-Id: Icd0f444c746810df4c9a1cc373eedfad1cd08d8b
2021-09-23 22:48:07 +00:00
Treehugger Robot
9af1361162
Merge "Remove enh from OWNERS." am: 23db699634
am: 174562c83c
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1834837
Change-Id: I9dae1785c2fbd3622b858a3a8c20323efe77bde2
2021-09-23 22:47:58 +00:00
Treehugger Robot
fa27392f8a
Merge "Warn on repo upload
if you're not uploading to AOSP master." am: 026eb31f80
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1834836
Change-Id: Iecc1012adcebfc5a10d865173cc01108f5394749
2021-09-23 22:30:56 +00:00
Treehugger Robot
174562c83c
Merge "Remove enh from OWNERS." am: 23db699634
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1834837
Change-Id: I37b3eae8d1299c37e759fb0094fbd57a9903a734
2021-09-23 22:30:51 +00:00
Treehugger Robot
026eb31f80
Merge "Warn on repo upload
if you're not uploading to AOSP master."
2021-09-23 22:26:00 +00:00