Commit graph

11272 commits

Author SHA1 Message Date
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
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
85045586f2 Merge Android U (ab/10368041)
Bug: 291102124
Merged-In: If72db59d9df356d4c99a280faa0a49440fba316e
Change-Id: Ie8c50607e59466119a6f736c39b704f524bf2902
2023-08-14 15:32:08 -07:00
David Anderson
5d80badc05 Merge "recovery: Fix old reference to libsnapshot_snapuserd." into main am: d52bdb8eae
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2657755

Change-Id: Ie3ad5bdafa423835352dd0e1aeff46fd9aaf78c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-04 21:06:47 +00:00
David Anderson
d52bdb8eae Merge "recovery: Fix old reference to libsnapshot_snapuserd." into main 2023-08-04 20:14:54 +00:00
Florian Mayer
90db0020b6 Merge "Add flag whether MTE state was forced" into main am: cf6676e15e
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2656836

Change-Id: I87bad089e42751275548a8dc0f81a73ba2e80c27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-14 22:38:04 +00:00
Florian Mayer
cf6676e15e Merge "Add flag whether MTE state was forced" into main 2023-07-14 22:07:15 +00:00
Eric Biggers
5dfa62d6af Merge "update_verifier: don't pass an unused command-line argument" into main am: 9910cbf8e0
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2653222

Change-Id: Idc48e7cca9874d94dc7d98b62b43874c54541c91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-14 20:42:23 +00:00
Eric Biggers
9910cbf8e0 Merge "update_verifier: don't pass an unused command-line argument" into main 2023-07-14 20:32:30 +00:00
Florian Mayer
9ff5549670 Add flag whether MTE state was forced
This will be used by mtectrl to remember whether the MTE state was
overriden using the force_on / force_off flags or set by the user. We
need that information when the force_on / force_off flag is reset.

Bug: 291106070
Change-Id: I6178f0b88b718e96e5c8ee39113848f422e5fb6d
2023-07-14 11:07:30 -07:00
David Anderson
1adca9c1aa recovery: Fix old reference to libsnapshot_snapuserd.
Bug: 288273605
Test: builds
Change-Id: I4436f75e3a8481fae10e183d31d7e473d1dbbce1
2023-07-13 13:04:35 -07:00
Eric Biggers
0ce2b87528 update_verifier: don't pass an unused command-line argument
update_verifier is being passed the current stage of Full Disk
Encryption (FDE): "nonencrypted" or "${vold.decrypt}".  However, since
FDE is no longer supported, it's actually now always "nonencrypted"
(which is confusing because there *is* encryption, it's just not FDE).
Also, update_verifier doesn't actually do anything with this
command-line argument, and based on the git history it never has.

Therefore, let's update the service definition to just have an
"update_verifier" service that passes no command-line argument.

Bug: 208476087
Test: presubmit
Change-Id: I8b62290360401024b6888c2e9488207d878d3f67
2023-07-12 16:58:24 +00:00
Chuong Hoang
445fa201d9 Merge "Read brightness-related properties from ro.recovery.ui" am: 1937b3fd30
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2646359

Change-Id: I75f4d1175be9e831f275e0a120b4d50f8eacafe7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-06 02:52:43 +00:00
Chuong Hoang
1937b3fd30 Merge "Read brightness-related properties from ro.recovery.ui" 2023-07-06 02:23:16 +00:00
Chuong Hoang
0b6c017613 Read brightness-related properties from ro.recovery.ui
This allows configurable brightness levels and file paths through
BoardConfig.

Bug: 221048336
Test: brightness file paths and levels are successfully overwritten on
devices that don't use default values.

Change-Id: I357dc58b7b3d9784554c68cbb86fe345a5587735
2023-06-30 04:38:53 +00:00
Elliott Hughes
ebb6d026f0 Merge "Use the hermetic gzip instead of minigzip." am: c4e7b82c44
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2631950

Change-Id: I9e9655813429a7e96c4b5f09cab363069da62fd5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-29 15:22:47 +00:00
Elliott Hughes
c4e7b82c44 Merge "Use the hermetic gzip instead of minigzip." 2023-06-29 14:23:54 +00:00
Elliott Hughes
da675a945f Use the hermetic gzip instead of minigzip.
Bug: http://b/288169261
Test: treehugger
Change-Id: I7cb3d5468a79faedcae13d75913f11f5a8ea9e80
2023-06-21 10:10:42 -07:00
Abhishek Nigam
438997997c Merge "Wear Recovery UI: Adjust for round screens" am: a7d1d0256c am: 2b4e47be5a am: 0f18ef7b4c
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2623222

Change-Id: If72db59d9df356d4c99a280faa0a49440fba316e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-16 05:27:51 +00:00
Abhishek Nigam
0f18ef7b4c Merge "Wear Recovery UI: Adjust for round screens" am: a7d1d0256c am: 2b4e47be5a
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2623222

Change-Id: Ia77ece295576cd3c5542b6a5200cd1e185d67b1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-16 04:38:08 +00:00
Abhishek Nigam
2b4e47be5a Merge "Wear Recovery UI: Adjust for round screens" am: a7d1d0256c
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2623222

Change-Id: Ibb46a19cb1420a1cea952958b75a34b85b50d464
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-16 03:56:09 +00:00
Abhishek Nigam
a7d1d0256c Merge "Wear Recovery UI: Adjust for round screens" 2023-06-16 03:10:14 +00:00
Abhishek Nigam
ebc02271ec Wear Recovery UI: Adjust for round screens
Change-Id: Ice4b8d4fcdc37ee1ca44ef195cb870b141862f08
2023-06-16 01:45:53 +00:00
Treehugger Robot
f92173cffc Merge "Reclassify OFL as notice per cl/537072410" am: 1551e6a0a4 am: 277d749be1 am: fcd9af036a
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2611893

Change-Id: I8a3802ed372cb81d3842b53f415746f99c69aaf2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08 19:07:13 +00:00
Treehugger Robot
fcd9af036a Merge "Reclassify OFL as notice per cl/537072410" am: 1551e6a0a4 am: 277d749be1
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2611893

Change-Id: Iaf43f99b7ee2a646f6c7aa504cb8a7b12d465fef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08 18:19:27 +00:00
Treehugger Robot
277d749be1 Merge "Reclassify OFL as notice per cl/537072410" am: 1551e6a0a4
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2611893

Change-Id: I99b173f3868b5d07c6ed65004b0cfece331ff112
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08 17:38:59 +00:00
Treehugger Robot
1551e6a0a4 Merge "Reclassify OFL as notice per cl/537072410" 2023-06-08 16:33:00 +00:00
Treehugger Robot
54d7b283ad [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 75174e01fc -s ours am: 86bdd15b0d -s ours am: 6bf73c84ec -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0ef5bf7e7c9d33fea4812cbe064b382628963b82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-05 21:34:10 +00:00
Bill Yi
b058d47d75 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4e82387e76 -s ours am: 505f285d9c -s ours am: e72586f330 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I975615e99dd9efbfd8972bf0d1ade24945603299
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-05 21:34:08 +00:00
Bill Yi
c3eae2121c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ba65232a4e -s ours am: 7b2ed7ae0b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4c8ffe166e1d94a13685825034cce53335eeb6cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-05 21:10:32 +00:00
Treehugger Robot
6bf73c84ec [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 75174e01fc -s ours am: 86bdd15b0d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6e7cdc5960f15303a02e762063cda0b73ab73b55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-05 21:04:14 +00:00
Bill Yi
e72586f330 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4e82387e76 -s ours am: 505f285d9c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2a82ed50f18970238fef6a12d60e0430123eb56a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-05 21:04:12 +00:00
Bill Yi
7b2ed7ae0b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ba65232a4e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I54e2a3c5f6d2ca662cb440965ea3403cfb69028d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-05 20:22:04 +00:00
Treehugger Robot
86bdd15b0d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 75174e01fc -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6c55c3328b6eea8587ee4482f43fdf8e1aaf9817
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-05 19:53:21 +00:00
Bill Yi
505f285d9c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4e82387e76 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6b283f213f09349f0bebccb3ea38c03e83eaa684
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-05 19:53:19 +00:00
Treehugger Robot
75174e01fc Merge "Import translations. DO NOT MERGE ANYWHERE" 2023-06-05 18:31:41 +00:00
Bill Yi
4e82387e76 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I17765c3053bc4aa4393dd29ae24a1e8661260b88
2023-06-04 19:25:21 -07:00
Bill Yi
ba65232a4e Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I869a134a4ffc469c2dd2a62c95c37e90c3ab94ad
2023-06-04 12:14:27 -07:00
Bob Badour
033f943eef Reclassify OFL as notice per cl/537072410
Test: m droid dist

Change-Id: If296ee54462755b7f8b0657df317cf27b43a381a
2023-06-01 22:11:19 +00:00
Treehugger Robot
a4cc7246ac Merge "Rotate logs on every boot" am: 08ddd4179a am: be4883c025 am: f8061f13d0
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2606292

Change-Id: I91ddd8b7cdc9479c7dec21d051f40e3ecf99730a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-01 14:55:33 +00:00
Treehugger Robot
f8061f13d0 Merge "Rotate logs on every boot" am: 08ddd4179a am: be4883c025
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2606292

Change-Id: I4c52e1b53fd2d0c615927ecf67cbecc2c78b9bc6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-01 14:09:07 +00:00
Treehugger Robot
be4883c025 Merge "Rotate logs on every boot" am: 08ddd4179a
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2606292

Change-Id: Iacf2711d418ba06d8c1f6047d969e34f61954c21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-01 13:27:33 +00:00
Treehugger Robot
08ddd4179a Merge "Rotate logs on every boot" 2023-06-01 12:43:52 +00:00
Kelvin Zhang
55a0bb8856 Rotate logs on every boot
Currently, recovery-persist only rotates the logs if it can parse
/sys/fs/pstore/pmsg-ramoops-0 . Change this behavior to always rotate
last kernel log if present. This helps collect more debug logs when
troubleshooting boot failures.

Test: reboot device, make sure logs are rotated
Change-Id: I41da2eda3c6c241e90208af888e9e35bec0474fe
2023-05-30 06:39:56 -07:00
Treehugger Robot
1b5558ca65 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 654e7f4694 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5a67892af2670eee1d419bb04cd0df46d7ac7ee7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 04:42:53 +00:00
Bill Yi
9b4eebe6d3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: def2eb95fd -s ours
am skip reason: subject contains skip directive

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

Change-Id: I09e5b33f13fd332306ff1b33d95f097aa263f666
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 04:42:50 +00:00
Treehugger Robot
654e7f4694 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-05-04 03:57:11 +00:00
Bill Yi
51aa0173d2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3cd832292f -s ours am: 885c59e5fa -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id5e6095fd0f0bd503583330523990069b8fd06e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 20:01:48 +00:00
Bill Yi
885c59e5fa [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3cd832292f -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iebe5d0bf45cd1886540b1e7b24d48787219d4a26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 19:59:32 +00:00