summaryrefslogtreecommitdiff
path: root/init.hardware.rc
diff options
context:
space:
mode:
authorShawn Willden <swillden@google.com>2018-06-14 16:54:22 -0600
committerShawn Willden <swillden@google.com>2018-06-19 08:30:54 -0600
commit564bcbef333ceb92bbc333e5c96f9106d601e353 (patch)
treeb76895a2be43f109e871f7bfec4c28c4e4c4ad9e /init.hardware.rc
parente8c37cbff30ea5bad52fa039b460bfbf72b42bab (diff)
Wait for keymasters to start up.
Use wait_for_strongbox instead of wait_for_keymaster to wait until both keymaster HALs are ready. Bug: 90406546 Test: Boot the device Change-Id: I8c6065a4b035cb821b2d2dd1084ccdf764b8a9a4
Diffstat (limited to 'init.hardware.rc')
-rw-r--r--init.hardware.rc10
1 files changed, 8 insertions, 2 deletions
diff --git a/init.hardware.rc b/init.hardware.rc
index e662868..1dea14b 100644
--- a/init.hardware.rc
+++ b/init.hardware.rc
@@ -254,8 +254,8 @@ on late-fs
# cause services for bootanim not running.
wait_for_prop hwservicemanager.ready true
- # Wait for keymaster
- exec_start wait_for_keymaster
+ # Wait for keymaster HALs (TEE and StrongBox)
+ exec_start wait_for_strongbox
# Mount RW partitions which need run fsck
mount_all /vendor/etc/fstab.${ro.boot.hardware.platform} --late
@@ -822,6 +822,12 @@ service ppd /vendor/bin/mm-pp-dpps
socket pps stream 0660 system system
disabled
+service wait_for_strongbox /vendor/bin/hw/wait_for_strongbox
+ user root
+ group root system
+ priority -20
+ ioprio rt 0
+
on property:init.svc.vendor.hwcomposer-2-2=stopped
stop ppd