commit 5f306d7a3baa023d3f1ea70a06c92e70dc461136
author nagendra modadugu <ngm@google.com> Thu Jan 23 14:44:12 2020 -0800
committer nagendra modadugu <ngm@google.com> Fri Mar 20 11:10:03 2020 -0700
tree e96e5523807b4fc84e3002e3964a3e0c8f2f8fb6
parent 1ff4829be56bc7ad10ed5e0b39b18ad85c48a12a

manifest.xml: switch keymaster/strongbox 4.0 to 4.1

Switch strongbox over to the KM4.1 HAL.

Bug: 136506341
Test: -userdebug builds, HAL is reachable, but 4.1 VTS fail
Change-Id: I83691bb35eefd604ea694173888e0b27434fc70a

CleanSpec.mk

diff --git a/CleanSpec.mk b/CleanSpec.mk
index fd25967..734d496 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -100,7 +100,7 @@
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/lib64/hw/android.hardware.graphics.composer@2.1-impl.so)
 
 # Remove StrongBox RC
-$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/etc/init/android.hardware.keymaster@4.0-service.citadel.rc)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/etc/init/android.hardware.keymaster@4.1-service.citadel.rc)
 
 # Migrate to versioned VNDK directory
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/vndk-sp)

device.mk

diff --git a/device.mk b/device.mk
index 5e07fec..f43ffda 100644
--- a/device.mk
+++ b/device.mk
@@ -687,7 +687,7 @@
     android.hardware.authsecret@1.0-service.citadel \
     android.hardware.oemlock@1.0-service.citadel \
     android.hardware.weaver@1.0-service.citadel \
-    android.hardware.keymaster@4.0-service.citadel \
+    android.hardware.keymaster@4.1-service.citadel \
     wait_for_strongbox
 
 # Citadel debug stuff

init.hardware.rc

diff --git a/init.hardware.rc b/init.hardware.rc
index 7313f38..d3513c4 100644
--- a/init.hardware.rc
+++ b/init.hardware.rc
@@ -79,7 +79,7 @@
 
     # start Citadel keymaster (StrongBox) early
     start vendor.citadeld
-    start vendor.keymaster-4-0-citadel
+    start vendor.keymaster-4-1-citadel
 
     # Disable powersaving
     write /sys/module/lpm_levels/parameters/sleep_disabled 1

manifest.xml

diff --git a/manifest.xml b/manifest.xml
index f916bf3..d92df4e 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -170,12 +170,8 @@
     <hal format="hidl">
         <name>android.hardware.keymaster</name>
         <transport>hwbinder</transport>
-        <version>4.0</version>
-        <interface>
-            <name>IKeymasterDevice</name>
-            <instance>default</instance>
-            <instance>strongbox</instance>
-        </interface>
+        <fqname>@4.0::IKeymasterDevice/default</fqname>
+        <fqname>@4.1::IKeymasterDevice/strongbox</fqname>
     </hal>
     <hal format="hidl">
         <name>android.hardware.light</name>