commit 1a748afb1cc9a497648c64f83ccea99666cf7b45
author Calvin Huang <calhuang@google.com> Mon Mar 30 15:58:46 2020 -0700
committer Calvin Huang <calhuang@google.com> Mon Mar 30 23:16:29 2020 +0000
tree c2265b87149d3a994b946013cc5790fdb76ba723
parent ec446abd4003553a5cbe55a8a069d90c6cb63760

Remove keymaster from manifest to avoid conflict

Fix: 152807129
Test: Build should success, system should boot
Change-Id: Ia2b4fcc8c1197b166cf02974928f42f62548bdec

common/manifest.xml

diff --git a/common/manifest.xml b/common/manifest.xml
index fda646a..a49e2c7 100644
--- a/common/manifest.xml
+++ b/common/manifest.xml
@@ -72,15 +72,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>