Florian Mayer
7cf5730f28
[automerger skipped] Add flag whether MTE state was forced am: c4556af552
-s ours am: f87bbd8a86
-s ours
...
am skip reason: Merged-In I6178f0b88b718e96e5c8ee39113848f422e5fb6d with SHA-1 9ff5549670
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/24121848
Change-Id: Ia53c9be848e58f955261041b570d762d175677e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-25 21:48:08 +00:00
Florian Mayer
f87bbd8a86
[automerger skipped] Add flag whether MTE state was forced am: c4556af552
-s ours
...
am skip reason: Merged-In I6178f0b88b718e96e5c8ee39113848f422e5fb6d with SHA-1 9ff5549670
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/24121848
Change-Id: Ice4e1f4e4df69d7ee26edd20a300527ca8ad2e27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-25 20:36:03 +00:00
Automerger Merge Worker
c73a50d988
Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0b012dc38b
-s ours am: e8813b9c9d
-s ours" into udc-qpr-dev-plus-aosp am: 47f4c709b2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/24179525
Change-Id: I48e5bbb7a425cae6a27745d6aad3d9313e42e5fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-24 21:50:43 +00:00
Bill Yi
59dd434333
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0b012dc38b
-s ours am: e8813b9c9d
-s ours am: ebbf09c1e3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/24179525
Change-Id: Ia1934d715e1a9c4246cef3ee5ae57890b27e60c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-24 21:50:32 +00:00
Bill Yi
f8fb14e507
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0b012dc38b
-s ours am: 4f2efa7239
-s ours am: e87368a525
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/24179525
Change-Id: Ifccbe7afafe02b638cb855228bba7ef33f34692d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-24 21:43:11 +00:00
Automerger Merge Worker
47f4c709b2
Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0b012dc38b
-s ours am: e8813b9c9d
-s ours" into udc-qpr-dev-plus-aosp
2023-07-24 20:56:21 +00:00
Bill Yi
ebbf09c1e3
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0b012dc38b
-s ours am: e8813b9c9d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/24179525
Change-Id: I45ea8ce805a7b0136dfc3df2e20e5b5598e0e6c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-24 20:54:04 +00:00
Bill Yi
e87368a525
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0b012dc38b
-s ours am: 4f2efa7239
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/24179525
Change-Id: I747e804d5f3728c52bccde92ad0e58d5144a38ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-24 20:49:43 +00:00
Bill Yi
4f2efa7239
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0b012dc38b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/24179525
Change-Id: I3f03194a7887200f9b4f15b18ab5cc31f3ef6330
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-24 20:31:30 +00:00
Bill Yi
e8813b9c9d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0b012dc38b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/24179525
Change-Id: I71da393da1ba8a50a32b4ab88680ffda67f2370d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-24 20:29:49 +00:00
Bill Yi
0b012dc38b
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ie5d610aa5656deda62e108b92a71d7d98251c0bc
2023-07-24 09:07:06 -07:00
Florian Mayer
c4556af552
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.
(this is a cherry-pick of 9ff5549670
)
Bug: 291106070
Merged-In: I6178f0b88b718e96e5c8ee39113848f422e5fb6d
Change-Id: I6178f0b88b718e96e5c8ee39113848f422e5fb6d
2023-07-18 15:45:15 -07:00
Florian Mayer
e9eb668331
Merge "Add flag whether MTE state was forced" into main am: cf6676e15e
am: 90db0020b6
am: 6e222b158f
am: 435389091c
am: 01ab838c4e
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2656836
Change-Id: I67e8765776d8703097012cf925521d5f2ba2623c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-17 21:49:05 +00:00
Eric Biggers
413ff3228c
Merge "update_verifier: don't pass an unused command-line argument" into main am: 9910cbf8e0
am: 5dfa62d6af
am: 9f1e980d3e
am: f02d996c9b
am: 1baa963830
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2653222
Change-Id: I90eb1d9d54cd2f5ceaf4629d83fba7c90709d87c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-17 21:06:31 +00:00
Florian Mayer
01ab838c4e
Merge "Add flag whether MTE state was forced" into main am: cf6676e15e
am: 90db0020b6
am: 6e222b158f
am: 435389091c
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2656836
Change-Id: Icb74b19434058f1a3e7a7b7162b54448e1bfb07a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-15 01:20:12 +00:00
Florian Mayer
435389091c
Merge "Add flag whether MTE state was forced" into main am: cf6676e15e
am: 90db0020b6
am: 6e222b158f
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2656836
Change-Id: Iaa37d210385e575954d8fc7afca16dd99a16e54e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-15 00:33:52 +00:00
Florian Mayer
6e222b158f
Merge "Add flag whether MTE state was forced" into main am: cf6676e15e
am: 90db0020b6
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2656836
Change-Id: I7655f7fd17d39151b6c785c3dfbd0456f50a4b3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-14 23:51:04 +00:00
Eric Biggers
1baa963830
Merge "update_verifier: don't pass an unused command-line argument" into main am: 9910cbf8e0
am: 5dfa62d6af
am: 9f1e980d3e
am: f02d996c9b
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2653222
Change-Id: I2a17486f593609f8a41a4f196bb17204e6b6fd4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-14 23:05:34 +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
Eric Biggers
f02d996c9b
Merge "update_verifier: don't pass an unused command-line argument" into main am: 9910cbf8e0
am: 5dfa62d6af
am: 9f1e980d3e
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2653222
Change-Id: Ia486370280bfb64497e12b98c54f35e269e1e32a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-14 22:15:50 +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
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
1679bfa2a2
Merge "Read brightness-related properties from ro.recovery.ui
" into main
2023-07-07 18:24:00 +00:00
Chuong Hoang
b7383ba0b2
Merge "Read brightness-related properties from ro.recovery.ui
" am: 1937b3fd30
am: 445fa201d9
am: 348895178c
am: 825a34c678
am: 20c4c81209
am: d323d48054
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2646359
Change-Id: I21daac23486d92edf90ce4440789ca2042642c41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-06 06:52:12 +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
23cfb10771
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.
(cherry picked from https://android-review.googlesource.com/q/commit:0b6c017613f0b7843bd59d33ea0fe3b83c872e65 )
Merged-In: I357dc58b7b3d9784554c68cbb86fe345a5587735
Change-Id: I357dc58b7b3d9784554c68cbb86fe345a5587735
2023-07-06 03:10:30 +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
e699795e84
Merge "Use the hermetic gzip instead of minigzip." am: c4e7b82c44
am: ebb6d026f0
am: a8e558b721
am: 36524249e6
am: cd0a72c926
am: edf0153bd8
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2631950
Change-Id: I43f0f77fe5964b3cd49df22f32bf0d67b6c1d5e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-29 19:18:11 +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
23ba11b0bf
Merge "Wear Recovery UI: Adjust for round screens" am: a7d1d0256c
am: 2b4e47be5a
am: 0f18ef7b4c
am: 438997997c
am: 2e95c4372d
am: 55ff90e85c
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2623222
Change-Id: Ie4ed1ee02346510ed9ca6d802eab5083a798ae5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-16 07:29:37 +00: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