commit 535f30c8aceca7f9ba4640336d5bed0fa9aa0835
author Tomasz Wasilczyk <twasilczyk@google.com> Mon Nov 08 16:10:28 2021 -0800
committer Tomasz Wasilczyk <twasilczyk@google.com> Tue Nov 23 21:31:42 2021 -0800
tree 17ef16da3c2a20decf2ddbe1519d45e48bb9d0db
parent 9375f3a7e494cff9f78b7c8102c6590ff837baec

Implement RadioModem for AIDL-HIDL Telephony HAL translator

Bug: 203699028
Test: Boot and grep logcat against radiocompat
Change-Id: I670f78af2cd7a0ce0b49dfc802fd363f47d9b6a6

radio/aidl/compat/service/Android.bp

diff --git a/radio/aidl/compat/service/Android.bp b/radio/aidl/compat/service/Android.bp
index 0536c1c..52eb71f 100644
--- a/radio/aidl/compat/service/Android.bp
+++ b/radio/aidl/compat/service/Android.bp
@@ -41,6 +41,7 @@
         "android.hardware.radio.config@1.3",
         "android.hardware.radio.data-V1-ndk",
         "android.hardware.radio.messaging-V1-ndk",
+        "android.hardware.radio.modem-V1-ndk",
         "android.hardware.radio.network-V1-ndk",
         "android.hardware.radio.sim-V1-ndk",
         "android.hardware.radio.voice-V1-ndk",

radio/aidl/compat/service/radio-compat.xml

diff --git a/radio/aidl/compat/service/radio-compat.xml b/radio/aidl/compat/service/radio-compat.xml
index d3f4212..a7089e6 100644
--- a/radio/aidl/compat/service/radio-compat.xml
+++ b/radio/aidl/compat/service/radio-compat.xml
@@ -18,6 +18,10 @@
         <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>

radio/aidl/compat/service/service.cpp

diff --git a/radio/aidl/compat/service/service.cpp b/radio/aidl/compat/service/service.cpp
index 3d60ffe..2a67569 100644
--- a/radio/aidl/compat/service/service.cpp
+++ b/radio/aidl/compat/service/service.cpp
@@ -23,6 +23,7 @@
 #include <libradiocompat/RadioData.h>
 #include <libradiocompat/RadioIndication.h>
 #include <libradiocompat/RadioMessaging.h>
+#include <libradiocompat/RadioModem.h>
 #include <libradiocompat/RadioNetwork.h>
 #include <libradiocompat/RadioResponse.h>
 #include <libradiocompat/RadioSim.h>
@@ -62,6 +63,7 @@
 
     publishRadioHal<compat::RadioData>(radioHidl, responseCb, indicationCb, slot);
     publishRadioHal<compat::RadioMessaging>(radioHidl, responseCb, indicationCb, slot);
+    publishRadioHal<compat::RadioModem>(radioHidl, responseCb, indicationCb, slot);
     publishRadioHal<compat::RadioNetwork>(radioHidl, responseCb, indicationCb, slot);
     publishRadioHal<compat::RadioSim>(radioHidl, responseCb, indicationCb, slot);
     publishRadioHal<compat::RadioVoice>(radioHidl, responseCb, indicationCb, slot);