commit 30a7d09245ba4fcc4ef9d5f19181732cb97b7f8f
author Nathan Harold <nharold@google.com> Thu Jan 02 15:08:37 2020 -0800
committer Nathan Harold <nharold@google.com> Tue Jan 07 12:33:45 2020 -0800
tree 01b1ad7c2dfd94f0b8d9595b9c4a7c8ca1cfc46c
parent 2a6ab08ecec4122a295934c26d179dca605f59a6

Add RadioIndicationFilter API update for HAL 1.5

Bug: 146805410
Test: make aosp_cf_x86_phone-userdebug
Change-Id: I2f3d493ae5233cbfe7fcff8466d078165090c278

guest/hals/ril/libril/ril_service.cpp

diff --git a/guest/hals/ril/libril/ril_service.cpp b/guest/hals/ril/libril/ril_service.cpp
index 9a2b042..43ccc6f 100755
--- a/guest/hals/ril/libril/ril_service.cpp
+++ b/guest/hals/ril/libril/ril_service.cpp
@@ -556,6 +556,8 @@
             const hidl_vec<::android::hardware::radio::V1_5::DataProfileInfo>& profiles);
     Return<void> setRadioPower_1_5(int32_t serial, bool powerOn, bool forEmergencyCall,
             bool preferredForEmergencyCall);
+    Return<void> setIndicationFilter_1_5(int32_t serial,
+            hidl_bitfield<::android::hardware::radio::V1_5::IndicationFilter> indicationFilter);
 };
 
 struct OemHookImpl : public IOemHook {
@@ -3764,6 +3766,15 @@
     return Void();
 }
 
+Return<void> RadioImpl_1_5::setIndicationFilter_1_5(int32_t /* serial */,
+        hidl_bitfield<::android::hardware::radio::V1_5::IndicationFilter> /* indicationFilter */) {
+    // TODO implement
+#if VDBG
+    RLOGE("[%04d]< %s", serial, "Method is not implemented");
+#endif
+    return Void();
+}
+
 // OEM hook methods:
 Return<void> OemHookImpl::setResponseFunctions(
         const ::android::sp<IOemHookResponse>& oemHookResponseParam,
@@ -8108,6 +8119,29 @@
     return 0;
 }
 
+int radio_1_5::setIndicationFilterResponse_1_5(int slotId,
+                              int responseType, int serial, RIL_Errno e,
+                              void *response, size_t responselen) {
+#if VDBG
+    RLOGD("setIndicationFilterResponse_1_5: serial %d", serial);
+#endif
+
+    if (radioService[slotId]->mRadioResponseV1_5 != NULL) {
+        RadioResponseInfo responseInfo = {};
+        populateResponseInfo(responseInfo, serial, responseType, e);
+        Return<void> retStatus
+                = radioService[slotId]->mRadioResponseV1_5->
+                        setIndicationFilterResponse_1_5(responseInfo);
+        radioService[slotId]->checkReturnStatus(retStatus);
+    } else {
+        RLOGE("setIndicationFilterResponse_1_5: radioService[%d]->mRadioResponse == NULL",
+                slotId);
+    }
+
+    return 0;
+}
+
+
 /***************************************************************************************************
  * INDICATION FUNCTIONS
  * The below function handle unsolicited messages coming from the Radio

guest/hals/ril/libril/ril_service.h

diff --git a/guest/hals/ril/libril/ril_service.h b/guest/hals/ril/libril/ril_service.h
index 7bf86ba..98ebfa2 100644
--- a/guest/hals/ril/libril/ril_service.h
+++ b/guest/hals/ril/libril/ril_service.h
@@ -801,6 +801,8 @@
 int setRadioPowerResponse_1_5(int slotId, int responseType, int serial, RIL_Errno e,
                               void *response, size_t responselen);
 
+int setIndicationFilterResponse_1_5(int slotId, int responseType, int serial, RIL_Errno e,
+                              void *response, size_t responselen);
 
 pthread_rwlock_t * getRadioServiceRwlock(int slotId);