commit 5f403d31d25706f295246406ea3e0fed75d153c9
author Huan Song <huans@google.com> Tue Aug 09 01:59:10 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Aug 09 01:59:10 2022 +0000
tree 615d1974d029ebe0b983905bccac10453d661d40
parent e872dac29182b69dd935f4fb94a8ef62c1966d7e
parent 0eca81208f141402e90cde4516c6457e55534bf3

Merge "Use AIDL Radio HAL."

64bitonly/manifest.radio.xml

diff --git a/64bitonly/manifest.radio.xml b/64bitonly/manifest.radio.xml
index 8d42288..827836f 100644
--- a/64bitonly/manifest.radio.xml
+++ b/64bitonly/manifest.radio.xml
@@ -1,20 +1,30 @@
 <manifest version="1.0" type="device" target-level="4">
-    <hal format="hidl">
+    <hal format="aidl">
         <name>android.hardware.radio.config</name>
-        <transport>hwbinder</transport>
-        <version>1.3</version>
-        <interface>
-            <name>IRadioConfig</name>
-            <instance>default</instance>
-        </interface>
+        <fqname>IRadioConfig/default</fqname>
     </hal>
-    <hal format="hidl">
-        <name>android.hardware.radio</name>
-        <transport>hwbinder</transport>
-        <version>1.6</version>
-        <interface>
-            <name>IRadio</name>
-            <instance>slot1</instance>
-        </interface>
+    <hal format="aidl">
+        <name>android.hardware.radio.data</name>
+        <fqname>IRadioData/slot1</fqname>
+    </hal>
+    <hal format="aidl">
+        <name>android.hardware.radio.messaging</name>
+        <fqname>IRadioMessaging/slot1</fqname>
+    </hal>
+    <hal format="aidl">
+        <name>android.hardware.radio.modem</name>
+        <fqname>IRadioModem/slot1</fqname>
+    </hal>
+    <hal format="aidl">
+        <name>android.hardware.radio.network</name>
+        <fqname>IRadioNetwork/slot1</fqname>
+    </hal>
+    <hal format="aidl">
+        <name>android.hardware.radio.sim</name>
+        <fqname>IRadioSim/slot1</fqname>
+    </hal>
+    <hal format="aidl">
+        <name>android.hardware.radio.voice</name>
+        <fqname>IRadioVoice/slot1</fqname>
     </hal>
 </manifest>

manifest.xml

diff --git a/manifest.xml b/manifest.xml
index ed8b031..1d2e7c8 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -81,23 +81,33 @@
             <instance>default</instance>
         </interface>
     </hal>
-       <hal format="hidl">
+    <hal format="aidl">
         <name>android.hardware.radio.config</name>
-        <transport>hwbinder</transport>
-        <version>1.3</version>
-        <interface>
-            <name>IRadioConfig</name>
-            <instance>default</instance>
-        </interface>
+        <fqname>IRadioConfig/default</fqname>
     </hal>
-    <hal format="hidl">
-        <name>android.hardware.radio</name>
-        <transport>hwbinder</transport>
-        <version>1.6</version>
-        <interface>
-            <name>IRadio</name>
-            <instance>slot1</instance>
-        </interface>
+    <hal format="aidl">
+        <name>android.hardware.radio.data</name>
+        <fqname>IRadioData/slot1</fqname>
+    </hal>
+    <hal format="aidl">
+        <name>android.hardware.radio.messaging</name>
+        <fqname>IRadioMessaging/slot1</fqname>
+    </hal>
+    <hal format="aidl">
+        <name>android.hardware.radio.modem</name>
+        <fqname>IRadioModem/slot1</fqname>
+    </hal>
+    <hal format="aidl">
+        <name>android.hardware.radio.network</name>
+        <fqname>IRadioNetwork/slot1</fqname>
+    </hal>
+    <hal format="aidl">
+        <name>android.hardware.radio.sim</name>
+        <fqname>IRadioSim/slot1</fqname>
+    </hal>
+    <hal format="aidl">
+        <name>android.hardware.radio.voice</name>
+        <fqname>IRadioVoice/slot1</fqname>
     </hal>
     <kernel target-level="5"/>
 </manifest>