Florian Mayer
cf6676e15e
Merge "Add flag whether MTE state was forced" into main
2023-07-14 22:07:15 +00:00
Eric Biggers
9f1e980d3e
Merge "update_verifier: don't pass an unused command-line argument" into main am: 9910cbf8e0
am: 5dfa62d6af
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2653222
Change-Id: I46c498e72a7b2ca598ea717d05b5f7b8b27b9990
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-14 21:27:48 +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
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
d323d48054
Merge "Read brightness-related properties from ro.recovery.ui
" am: 1937b3fd30
am: 445fa201d9
am: 348895178c
am: 825a34c678
am: 20c4c81209
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2646359
Change-Id: I0020e23cfbc7f6cc3c8c9fc50c551ad7402ad004
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-06 06:09:11 +00:00
Chuong Hoang
20c4c81209
Merge "Read brightness-related properties from ro.recovery.ui
" am: 1937b3fd30
am: 445fa201d9
am: 348895178c
am: 825a34c678
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2646359
Change-Id: I7feb49cc9f501edb20bcfc006ae14bd8e2ef762c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-06 05:27:33 +00:00
Chuong Hoang
825a34c678
Merge "Read brightness-related properties from ro.recovery.ui
" am: 1937b3fd30
am: 445fa201d9
am: 348895178c
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2646359
Change-Id: I9f899581e350540ce4175569f14cc347adb965db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-06 04:41:08 +00:00
Chuong Hoang
348895178c
Merge "Read brightness-related properties from ro.recovery.ui
" am: 1937b3fd30
am: 445fa201d9
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2646359
Change-Id: I02aa3caaa5e9c217f9e16d72fe1b486ef4083322
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-06 03:34: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
edf0153bd8
Merge "Use the hermetic gzip instead of minigzip." am: c4e7b82c44
am: ebb6d026f0
am: a8e558b721
am: 36524249e6
am: cd0a72c926
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2631950
Change-Id: I24b96895febc52da498824bd79f0c929e8abc0e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-29 18:21:12 +00:00
Elliott Hughes
cd0a72c926
Merge "Use the hermetic gzip instead of minigzip." am: c4e7b82c44
am: ebb6d026f0
am: a8e558b721
am: 36524249e6
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2631950
Change-Id: I3fce911a882056efe2cbdede263bd637730bc032
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-29 17:36:03 +00:00
Elliott Hughes
36524249e6
Merge "Use the hermetic gzip instead of minigzip." am: c4e7b82c44
am: ebb6d026f0
am: a8e558b721
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2631950
Change-Id: I65f0964bb5638b9a4efb92ee3a85e209020e2788
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-29 16:50:13 +00:00
Elliott Hughes
a8e558b721
Merge "Use the hermetic gzip instead of minigzip." am: c4e7b82c44
am: ebb6d026f0
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2631950
Change-Id: Ie7d7cf02df4553d396f2e0db7b2121d951bb04ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-29 16:05:31 +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
55ff90e85c
Merge "Wear Recovery UI: Adjust for round screens" am: a7d1d0256c
am: 2b4e47be5a
am: 0f18ef7b4c
am: 438997997c
am: 2e95c4372d
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2623222
Change-Id: I93ecf90de318c1133fb1926e0f35cac4b04f52d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-16 06:54:51 +00:00
Abhishek Nigam
2e95c4372d
Merge "Wear Recovery UI: Adjust for round screens" am: a7d1d0256c
am: 2b4e47be5a
am: 0f18ef7b4c
am: 438997997c
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2623222
Change-Id: I210ebb89919ae34fa890c9e7aa3d93c750a51c7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-16 06:12:40 +00: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
cd8f55131e
Merge "Reclassify OFL as notice per cl/537072410" am: 1551e6a0a4
am: 277d749be1
am: fcd9af036a
am: f92173cffc
am: b1f34e2518
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2611893
Change-Id: Ied5f6be8bd8db86a99007ebb33fa958f07bd0c5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08 20:32:10 +00:00
Treehugger Robot
b1f34e2518
Merge "Reclassify OFL as notice per cl/537072410" am: 1551e6a0a4
am: 277d749be1
am: fcd9af036a
am: f92173cffc
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2611893
Change-Id: I18a23b18a59c279a58b825d4df8339fd7342c264
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08 19:52:14 +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
d50756d25a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 75174e01fc
-s ours am: 86bdd15b0d
-s ours am: 6bf73c84ec
-s ours am: 54d7b283ad
-s ours am: 967f46db4d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2614849
Change-Id: I0ae310e2c16c726cebca02ababb09d4662259865
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-05 22:44:33 +00:00
Bill Yi
8faca79aeb
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4e82387e76
-s ours am: 505f285d9c
-s ours am: e72586f330
-s ours am: b058d47d75
-s ours am: 371f3675cf
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2614849
Change-Id: I660898d5f84ddda0fa89302b1282aa793543e9cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-05 22:44:31 +00:00
Bill Yi
d451fd858c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ba65232a4e
-s ours am: 7b2ed7ae0b
-s ours am: c3eae2121c
-s ours am: f42a72bc4d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/23557941
Change-Id: Ieb1686eff1ab8de791dfea2aa65a25a32e7e2dfb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-05 22:35:52 +00:00
Treehugger Robot
967f46db4d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 75174e01fc
-s ours am: 86bdd15b0d
-s ours am: 6bf73c84ec
-s ours am: 54d7b283ad
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2614849
Change-Id: Iaff60db34743dff12fe3758a52b00e430ec1a33c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-05 22:13:55 +00:00
Bill Yi
371f3675cf
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4e82387e76
-s ours am: 505f285d9c
-s ours am: e72586f330
-s ours am: b058d47d75
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2614849
Change-Id: I0761bbe7032b6710353c482e75a5ad4e080cde86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-05 22:13:54 +00:00
Bill Yi
f42a72bc4d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ba65232a4e
-s ours am: 7b2ed7ae0b
-s ours am: c3eae2121c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/23557941
Change-Id: Iafc1d40aa1652cdc4cf929574ceecaecdb3b458a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-05 21:57:53 +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