commit 86523fa89a6d3c28f207818418dbd5247d5f782b
author Roman Kiryanov <rkir@google.com> Fri Mar 27 10:44:22 2020 -0700
committer Roman Kiryanov <rkir@google.com> Fri Mar 27 23:42:37 2020 -0700
tree 49583be173850d85f779412c155caad04ad636cb
parent c78cb1389d78f107cdc81a2cda403bef8ddda759

Upgrade keymaster to @4.1

Bug: 152616625
Test: boot, lshal | grep keymaster
Signed-off-by: Roman Kiryanov <rkir@google.com>
Merged-In: I1c17a6089b856c563dd4e2e1a8c12a5c9b2c5c9f
Change-Id: Ia51398d50e5303d7ee9bebfd461bb88bf7113bb9

manifest.xml

diff --git a/manifest.xml b/manifest.xml
index de9eb2e..95d97a1 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -60,15 +60,6 @@
         </interface>
     </hal>
     <hal format="hidl">
-        <name>android.hardware.keymaster</name>
-        <transport>hwbinder</transport>
-        <version>4.0</version>
-        <interface>
-            <name>IKeymasterDevice</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-    <hal format="hidl">
         <name>android.hardware.graphics.allocator</name>
         <transport>hwbinder</transport>
         <version>3.0</version>

vendor.mk

diff --git a/vendor.mk b/vendor.mk
index cc33cc8..ffc0a1c 100644
--- a/vendor.mk
+++ b/vendor.mk
@@ -103,8 +103,7 @@
     android.hardware.health.storage@1.0-service \
 
 PRODUCT_PACKAGES += \
-    android.hardware.keymaster@4.0-impl \
-    android.hardware.keymaster@4.0-service
+    android.hardware.keymaster@4.1-service
 
 PRODUCT_PACKAGES += \
     DisplayCutoutEmulationEmu01Overlay \