From 098038147f5bd66806814d5868f560cc76b25d17 Mon Sep 17 00:00:00 2001
From: Astrako <apamarin@gmail.com>
Date: Fri, 27 Mar 2020 20:51:36 +0100
Subject: [PATCH] universal7870: small fixup in manifest

---
 configs/manifest.xml | 87 ++++++++------------------------------------
 1 file changed, 15 insertions(+), 72 deletions(-)

diff --git a/configs/manifest.xml b/configs/manifest.xml
index 25e2334..e8badb8 100644
--- a/configs/manifest.xml
+++ b/configs/manifest.xml
@@ -204,19 +204,26 @@
         </interface>
         <fqname>@1.0::IPower/default</fqname>
     </hal>
-    <hal format="hidl" override="true">
+    <hal format="hidl">
         <name>android.hardware.radio</name>
         <transport>hwbinder</transport>
-    </hal>
-    <hal format="hidl" override="true">
-        <name>android.hardware.radio</name>
-        <transport>hwbinder</transport>
-        <fqname>@1.2::ISap/slot1</fqname>
-        <fqname>@1.2::ISap/slot2</fqname>
+        <version>1.4</version>
+        <interface>
+            <name>IRadio</name>
+            <instance>slot1</instance>
+            <instance>slot2</instance>
+        </interface>
+        <interface>
+            <name>ISap</name>
+            <instance>slot1</instance>
+            <instance>slot2</instance>
+        </interface>
         <fqname>@1.4::IRadio/slot1</fqname>
         <fqname>@1.4::IRadio/slot2</fqname>
+        <fqname>@1.4::ISap/slot1</fqname>
+        <fqname>@1.4::ISap/slot2</fqname>
     </hal>
-    <hal format="hidl" override="true">
+    <hal format="hidl">
         <name>android.hardware.radio.config</name>
         <transport>hwbinder</transport>
         <version>1.1</version>
@@ -226,10 +233,6 @@
         </interface>
         <fqname>@1.1::IRadioConfig/default</fqname>
     </hal>
-    <hal format="hidl" override="true">
-        <name>android.hardware.radio.deprecated</name>
-        <transport>hwbinder</transport>
-    </hal>
     <hal format="hidl">
         <name>android.hardware.renderscript</name>
         <transport arch="32+64">passthrough</transport>
@@ -395,64 +398,4 @@
         </interface>
     </hal>
     -->
-    <hal format="hidl">
-        <name>vendor.samsung.hardware.gnss</name>
-        <transport>hwbinder</transport>
-        <version>2.0</version>
-        <interface>
-            <name>ISecGnss</name>
-            <instance>default</instance>
-        </interface>
-        <fqname>@2.0::ISecGnss/default</fqname>
-    </hal>
-    <hal format="hidl">
-        <name>vendor.samsung.hardware.nfc</name>
-        <transport>hwbinder</transport>
-        <version>2.0</version>
-        <interface>
-            <name>ISecNfc</name>
-            <instance>default</instance>
-        </interface>
-        <fqname>@2.0::ISecNfc/default</fqname>
-    </hal>
-    <hal format="hidl">
-        <name>vendor.samsung.hardware.radio</name>
-        <transport>hwbinder</transport>
-        <version>2.0</version>
-        <interface>
-            <name>ISecRadio</name>
-            <instance>slot1</instance>
-            <instance>slot2</instance>
-        </interface>
-        <fqname>@2.0::ISecRadio/slot1</fqname>
-        <fqname>@2.0::ISecRadio/slot2</fqname>
-    </hal>
-    <hal format="hidl">
-        <name>vendor.samsung.hardware.radio.bridge</name>
-        <transport>hwbinder</transport>
-        <version>2.0</version>
-        <interface>
-            <name>ISecBridge</name>
-            <instance>slot1</instance>
-            <instance>slot2</instance>
-        </interface>
-        <fqname>@2.0::ISecBridge/slot1</fqname>
-        <fqname>@2.0::ISecBridge/slot2</fqname>
-    </hal>
-    <hal format="hidl">
-        <name>vendor.samsung.hardware.radio.channel</name>
-        <transport>hwbinder</transport>
-        <version>2.0</version>
-        <interface>
-            <name>ISecChannel</name>
-            <instance>epdgd</instance>
-            <instance>epdgd2</instance>
-            <instance>imsd</instance>
-            <instance>imsd2</instance>
-        </interface>
-        <fqname>@2.0::ISecChannel/epdgd</fqname>
-        <fqname>@2.0::ISecChannel/epdgd2</fqname>
-        <fqname>@2.0::ISecChannel/imsd</fqname>
-        <fqname>@2.0::ISecChannel/imsd2</fqname>
-    </hal>
 </manifest>