Use AIDL Radio HAL.
Bug: 218391819
Test: it builds
Change-Id: Ic1512611da14d32e2eddbbc205d156d64652c7ef
Merged-In: Ic1512611da14d32e2eddbbc205d156d64652c7ef
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>
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>