diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-01-04 00:57:24 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-01-04 00:57:24 +0000 |
| commit | 9932d377cb108ce3fe59648e7ce9927c94536840 (patch) | |
| tree | e2c7480e69d56968709319c184d2477f01628e04 | |
| parent | 80269a05b872e377d2582c1c23dd531163ee7c52 (diff) | |
| parent | fe80546cd8328ad87a432070088f7ce58f6216e3 (diff) | |
| download | extras-android14-qpr2-release.tar.gz | |
Merge cherrypicks of ['android-review.googlesource.com/2877324'] into 24Q1-release.android-14.0.0_r37android-14.0.0_r36android-14.0.0_r35android-14.0.0_r34android-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29android14-qpr2-s5-releaseandroid14-qpr2-s4-releaseandroid14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-release
Change-Id: I11b8d669825e1473574ed40cbc66edd8e7e8b8f3
| -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} |