From 83085fd5b391c282200eb705ec36eacc1c16d7ca Mon Sep 17 00:00:00 2001
From: Janis Danisevskis <jdanis@google.com>
Date: Thu, 11 Aug 2022 20:01:12 -0600
Subject: [PATCH] msm8974-common: update keymaster to 4.1

Remove keymaster 3.0 entries and update to 4.1.
---
 manifest.xml | 9 ---------
 msm8974.mk   | 3 +--
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/manifest.xml b/manifest.xml
index b2b2cef..2e65c8b 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -102,15 +102,6 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="hidl">
-        <name>android.hardware.keymaster</name>
-        <transport>hwbinder</transport>
-        <version>3.0</version>
-        <interface>
-            <name>IKeymasterDevice</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
     <hal format="hidl">
         <name>android.hardware.media.omx</name>
         <transport>hwbinder</transport>
diff --git a/msm8974.mk b/msm8974.mk
index cc5749b..84ebc59 100644
--- a/msm8974.mk
+++ b/msm8974.mk
@@ -131,8 +131,7 @@ PRODUCT_COPY_FILES += \
 
 # Keymaster
 PRODUCT_PACKAGES += \
-    android.hardware.keymaster@3.0-impl \
-    android.hardware.keymaster@3.0-service
+    android.hardware.keymaster@4.1-service
 
 # Lights
 PRODUCT_PACKAGES += \