commit d2e7459b240f02aa6fa5ac63c149289e2d39ab8d
author Tomasz Wasilczyk <twasilczyk@google.com> Tue Nov 02 12:14:52 2021 -0700
committer Tomasz Wasilczyk <twasilczyk@google.com> Tue Nov 23 21:31:41 2021 -0800
tree dbb8d5315529d1b44f1a1c61ec6f3f472d5051c1
parent fb10e00a4f902d0cdbfa984f6e41d9f83d0a7a84

Implement RadioData for AIDL-HIDL Telephony HAL translator

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

radio/aidl/compat/service/Android.bp

diff --git a/radio/aidl/compat/service/Android.bp b/radio/aidl/compat/service/Android.bp
index 6a1cad5..e97e2db 100644
--- a/radio/aidl/compat/service/Android.bp
+++ b/radio/aidl/compat/service/Android.bp
@@ -39,6 +39,7 @@
         "android.hardware.radio.config@1.1",
         "android.hardware.radio.config@1.2",
         "android.hardware.radio.config@1.3",
+        "android.hardware.radio.data-V1-ndk",
         "android.hardware.radio.messaging-V1-ndk",
         "android.hardware.radio.sim-V1-ndk",
         "android.hardware.radio@1.0",

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 2164b28..ac812fb 100644
--- a/radio/aidl/compat/service/radio-compat.xml
+++ b/radio/aidl/compat/service/radio-compat.xml
@@ -10,6 +10,10 @@
     quick testing.
 
     <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>

radio/aidl/compat/service/service.cpp

diff --git a/radio/aidl/compat/service/service.cpp b/radio/aidl/compat/service/service.cpp
index e6dd03d..c97b47a 100644
--- a/radio/aidl/compat/service/service.cpp
+++ b/radio/aidl/compat/service/service.cpp
@@ -20,6 +20,7 @@
 #include <android/binder_manager.h>
 #include <android/binder_process.h>
 #include <libradiocompat/RadioConfig.h>
+#include <libradiocompat/RadioData.h>
 #include <libradiocompat/RadioIndication.h>
 #include <libradiocompat/RadioMessaging.h>
 #include <libradiocompat/RadioResponse.h>
@@ -57,6 +58,7 @@
     auto indicationCb = sp<compat::RadioIndication>::make();
     radioHidl->setResponseFunctions(responseCb, indicationCb).assertOk();
 
+    publishRadioHal<compat::RadioData>(radioHidl, responseCb, indicationCb, slot);
     publishRadioHal<compat::RadioMessaging>(radioHidl, responseCb, indicationCb, slot);
     publishRadioHal<compat::RadioSim>(radioHidl, responseCb, indicationCb, slot);
 }