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

Commit 8456d54f authored Sep 10, 2024 by Armelle Laine Committed by Automerger Merge Worker Sep 10, 2024

Merge "trusty: keymint/gatekeeper: Pass device name from init scripts" into...

Merge "trusty: keymint/gatekeeper: Pass device name from init scripts" into main am: 9ec007ac am: f2d6acf0

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

Change-Id: I944005219dc9b549eb83747352086a2a9838b9d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 0fa81818 f2d6acf0

trusty/gatekeeper/android.hardware.gatekeeper-service.trusty.rc

+2 −1

Original line number	Diff line number	Diff line
		service vendor.gatekeeper_default /vendor/bin/hw/android.hardware.gatekeeper-service.trusty
		service vendor.gatekeeper_default /vendor/bin/hw/android.hardware.gatekeeper-service.trusty \
		--dev ${ro.hardware.trusty_ipc_dev.gatekeeper:-/dev/trusty-ipc-dev0}
		class hal
		user system
		group system

trusty/keymaster/keymint/android.hardware.security.keymint-service.trusty.rc

+2 −1

Original line number	Diff line number	Diff line
		service vendor.keymint-trusty /vendor/bin/hw/android.hardware.security.keymint-service.trusty
		service vendor.keymint-trusty /vendor/bin/hw/android.hardware.security.keymint-service.trusty \
		--dev ${ro.hardware.trusty_ipc_dev.keymint:-/dev/trusty-ipc-dev0}
		class early_hal
		user nobody
		group drmrpc

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

+3 −2

Original line number	Diff line number	Diff line
		service vendor.keymint.rust-trusty /vendor/bin/hw/android.hardware.security.keymint-service.rust.trusty
		service vendor.keymint.rust-trusty /vendor/bin/hw/android.hardware.security.keymint-service.rust.trusty \
		--dev ${ro.hardware.trusty_ipc_dev.keymint:-/dev/trusty-ipc-dev0}
		class early_hal
		user nobody
		group drmrpc