Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9c963e13 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "trusty: keymint: rename trusty_ipc_dev property" into main am: 8da4af89 am: afa41fed 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/3273002



Change-Id: I0d1eaf0d7fcc7e88f84c1b4f2f79324d3f0068bc
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7479cf94 afa41fed

trusty/keymint/android.hardware.security.keymint-service.rust.trusty.system.nonsecure.rc

+3 −3
Original line number Diff line number Diff line 
service system.keymint.rust-trusty.nonsecure \

  /system_ext/bin/hw/android.hardware.security.keymint-service.rust.trusty.system.nonsecure \

  --dev ${ro.hardware.trusty_ipc_dev.keymint:-/dev/trusty-ipc-dev0}

  --dev ${system.keymint.trusty_ipc_dev:-/dev/trusty-ipc-dev0}

    disabled

    user nobody

    group drmrpc
@@ -12,6 +12,6 @@ service system.keymint.rust-trusty.nonsecure \ 
# 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 && \

   property:ro.hardware.trusty_vm_cid=*

    setprop ro.hardware.trusty_ipc_dev.keymint VSOCK:${ro.hardware.trusty_vm_cid}:1

   property:trusty_vm_system.vm_cid=*

    setprop system.keymint.trusty_ipc_dev VSOCK:${trusty_vm_system.vm_cid}:1

    start system.keymint.rust-trusty.nonsecure