From 16693fae255a5a25dbb22ac5d48c7c1997099ff4 Mon Sep 17 00:00:00 2001 From: Alice Wang Date: Fri, 8 Nov 2024 12:19:10 +0000 Subject: [PATCH] Rename system property to enable KeyMint VM This allows us to regroup Widevine VM under the same trusty group. Bug: 368502791 Test: launch_cvd --secure_hals=guest_keymint_trusty_insecure Test: atest VtsAidlSharedSecretTargetTest Change-Id: Ica76a896e99f70a64af229bda68622a2ce0dea1f --- ...are.security.keymint-service.rust.trusty.system.nonsecure.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 ca6132e5e..410e10a61 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 @@ service system.keymint.rust-trusty.nonsecure \ # 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.security.keymint.trusty.system=1 && \ +on late-fs && property:ro.hardware.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