| commit | 20d2c3db61cb40ed760b203eab42ef29b658b17a | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Sat Nov 23 01:25:52 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Nov 23 01:25:52 2024 +0000 |
| tree | 064b570db9a0ac240710e9fe6db536f6e8bc861e | |
| parent | 117e6318e766ce1688e0f159c7f0fb2ac3150a15 [diff] | |
| parent | 33053b6f1ac9a55926f23b6afed532750a444f0b [diff] |
Merge "Remove |ro.hardware.| prefix in KM VM sys property" into main am: e3db20857f am: 33053b6f1a Original change: https://android-review.googlesource.com/c/platform/system/core/+/3365402 Change-Id: I9df4f6fd231a26bef9008782f4a729ca2c02ea19 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/trusty/keymint/android.hardware.security.keymint-service.rust.trusty.system.nonsecure.rc b/trusty/keymint/android.hardware.security.keymint-service.rust.trusty.system.nonsecure.rc index 410e10a..e580651 100644 --- a/trusty/keymint/android.hardware.security.keymint-service.rust.trusty.system.nonsecure.rc +++ b/trusty/keymint/android.hardware.security.keymint-service.rust.trusty.system.nonsecure.rc
@@ -11,7 +11,7 @@ # Only starts the non-secure KeyMint HALs when the KeyMint VM feature is enabled # TODO(b/357821690): Start the KeyMint HALs when the KeyMint VM is ready once the Trusty VM # has a mechanism to notify the host. -on late-fs && property:ro.hardware.trusty.security_vm.keymint.enabled=1 && \ +on late-fs && property:trusty.security_vm.keymint.enabled=1 && \ property:trusty.security_vm.vm_cid=* setprop system.keymint.trusty_ipc_dev VSOCK:${trusty.security_vm.vm_cid}:1 start system.keymint.rust-trusty.nonsecure