commit 2359251f0e0569c88811058e36901182877b49dd
author Devin Moore <devinmoore@google.com> Fri Oct 07 17:52:12 2022 +0000
committer Devin Moore <devinmoore@google.com> Mon Oct 17 18:06:09 2022 +0000
tree f391517e99082d78dd5b591d82dd84a35014c724
parent 6ac1197a063b356af3f2f704ee80a32550d1d4f4

Remove hidl.token and hidl.manager from the manifest file

These are moved into the manifest fragment for hwservicemanager, the
processes that provides these interface implementations.

Test: Boot Cuttlefish with and without hwservicemanager installed
Bug: 218588089
Change-Id: I7c19c709740bdd4774ea5d5e2acd3bbd5d8f786a

vintfdata/manifest.xml

diff --git a/vintfdata/manifest.xml b/vintfdata/manifest.xml
index c38a2a2..f200d0f 100644
--- a/vintfdata/manifest.xml
+++ b/vintfdata/manifest.xml
@@ -1,14 +1,5 @@
 <manifest version="1.0" type="framework">
     <hal>
-        <name>android.hidl.manager</name>
-        <transport>hwbinder</transport>
-        <version>1.2</version>
-        <interface>
-            <name>IServiceManager</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-    <hal>
         <name>android.hidl.memory</name>
         <transport arch="32+64">passthrough</transport>
         <version>1.0</version>
@@ -17,15 +8,6 @@
             <instance>ashmem</instance>
         </interface>
     </hal>
-    <hal>
-        <name>android.hidl.token</name>
-        <transport>hwbinder</transport>
-        <version>1.0</version>
-        <interface>
-            <name>ITokenManager</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
     <hal max-level="6">
         <name>android.frameworks.displayservice</name>
         <transport>hwbinder</transport>