diff options
| author | Evgenii Stepanov <eugenis@google.com> | 2023-12-15 14:49:22 -0800 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-01-04 00:53:30 +0000 |
| commit | fe80546cd8328ad87a432070088f7ce58f6216e3 (patch) | |
| tree | e2c7480e69d56968709319c184d2477f01628e04 | |
| parent | 80269a05b872e377d2582c1c23dd531163ee7c52 (diff) | |
| download | extras-fe80546cd8328ad87a432070088f7ce58f6216e3.tar.gz | |
Gate all bootloader override logic behind bootctl_supported=1.
Fixes potential deadlock during boot on fullmte devices.
Bug: 311331983
Test: in a fullmte build
setprop persist.device_config.runtime_native_boot.bootloader_override force_on
reboot
(cherry picked from https://android-review.googlesource.com/q/commit:cb4199a1bc3d6b499e6790fc3db5db6bcdb360c9)
Merged-In: I5a4e13bb5d99373fc05a542b49557b0102b70df2
Change-Id: I5a4e13bb5d99373fc05a542b49557b0102b70df2
| -rw-r--r-- | mtectrl/mtectrl.rc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mtectrl/mtectrl.rc b/mtectrl/mtectrl.rc index e5e0fe07..9f5a31c9 100644 --- a/mtectrl/mtectrl.rc +++ b/mtectrl/mtectrl.rc @@ -12,11 +12,11 @@ # See the License for the specific language governing permissions and # limitations under the License. -on property:arm64.memtag.bootctl=* +on property:arm64.memtag.bootctl=* && property:ro.arm64.memtag.bootctl_supported=1 wait_for_prop arm64.memtag.bootctl_loaded 1 exec -- /system/bin/mtectrl ${arm64.memtag.bootctl:-none} ${persist.device_config.runtime_native_boot.bootloader_override:-default} -on property:persist.device_config.runtime_native_boot.bootloader_override=* +on property:persist.device_config.runtime_native_boot.bootloader_override=* && property:ro.arm64.memtag.bootctl_supported=1 wait_for_prop arm64.memtag.bootctl_loaded 1 exec -- /system/bin/mtectrl ${arm64.memtag.bootctl:-none} ${persist.device_config.runtime_native_boot.bootloader_override:-default} |