diff options
| -rw-r--r-- | device.mk | 4 | ||||
| -rw-r--r-- | init.hardware.rc | 13 | ||||
| -rw-r--r-- | manifest.xml | 1 |
3 files changed, 16 insertions, 2 deletions
@@ -624,7 +624,9 @@ PRODUCT_PACKAGES += \ citadel_updater \ android.hardware.authsecret@1.0-service.citadel \ android.hardware.oemlock@1.0-service.citadel \ - android.hardware.weaver@1.0-service.citadel + android.hardware.weaver@1.0-service.citadel \ + android.hardware.keymaster@4.0-service.citadel \ + wait_for_strongbox # Citadel debug stuff PRODUCT_PACKAGES_DEBUG += \ diff --git a/init.hardware.rc b/init.hardware.rc index 53214dce..a8d9e8c8 100644 --- a/init.hardware.rc +++ b/init.hardware.rc @@ -65,6 +65,11 @@ on init start vendor.qseecomd start keymaster-4-0 + # start Citadel keymaster (StrongBox) early + start vndservicemanager + start citadeld + start vendor.keymaster-4-0-citadel + # Boot time fs tune write /sys/block/mmcblk0/queue/iostats 0 write /sys/block/mmcblk0/queue/scheduler cfq @@ -239,7 +244,7 @@ on late-fs wait_for_prop hwservicemanager.ready true # Wait for keymaster - exec_start wait_for_keymaster + exec_start wait_for_strongbox # Mount RW partitions which need run fsck mount_all /vendor/etc/fstab.${ro.boot.hardware.platform} --late @@ -794,6 +799,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 diff --git a/manifest.xml b/manifest.xml index cbefbc8a..02e87736 100644 --- a/manifest.xml +++ b/manifest.xml @@ -185,6 +185,7 @@ <interface> <name>IKeymasterDevice</name> <instance>default</instance> + <instance>strongbox</instance> </interface> </hal> <hal format="hidl"> |