commit f12c6374fa45d745a7700eb03dbee089b1aaf67f
author Nathan Harold <nharold@google.com> Fri Jan 17 19:12:37 2020 -0800
committer Sarah Chin <sarahchin@google.com> Wed Jan 22 00:33:39 2020 -0800
tree ce483ba0c2939f22f8dd1f12c3f7c9ebfbdf93bf
parent a68abfc373bf56a808217989abed70fbf5193604

Add get(Voice|Data)RegistrationState_1_5

-Glue in getVoiceRegistrationState_1_5
-Glue in getDataRegistrationState_1_5

Bug: 73629308
Test: make aosp_cf_x86_64_phone-userdebug
Change-Id: I6002b0ce91764725c65f94843fb33a6a35c503f1

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 7f5b74d..134acb3 100755
--- a/guest/hals/ril/libril/ril_service.cpp
+++ b/guest/hals/ril/libril/ril_service.cpp
@@ -559,6 +559,8 @@
     Return<void> setIndicationFilter_1_5(int32_t serial,
             hidl_bitfield<::android::hardware::radio::V1_5::IndicationFilter> indicationFilter);
     Return<void> getBarringInfo(int32_t serial);
+    Return<void> getVoiceRegistrationState_1_5(int32_t serial);
+    Return<void> getDataRegistrationState_1_5(int32_t serial);
 };
 
 struct OemHookImpl : public IOemHook {
@@ -1172,6 +1174,22 @@
     return Void();
 }
 
+Return<void> RadioImpl_1_5::getVoiceRegistrationState_1_5(int32_t serial) {
+#if VDBG
+    RLOGD("getVoiceRegistrationState: serial %d", serial);
+#endif
+    dispatchVoid(serial, mSlotId, RIL_REQUEST_VOICE_REGISTRATION_STATE);
+    return Void();
+}
+
+Return<void> RadioImpl_1_5::getDataRegistrationState_1_5(int32_t serial) {
+#if VDBG
+    RLOGD("getDataRegistrationState: serial %d", serial);
+#endif
+    dispatchVoid(serial, mSlotId, RIL_REQUEST_DATA_REGISTRATION_STATE);
+    return Void();
+}
+
 Return<void> RadioImpl_1_5::getOperator(int32_t serial) {
 #if VDBG
     RLOGD("getOperator: serial %d", serial);
@@ -4817,7 +4835,7 @@
                 if (e == RIL_E_SUCCESS) responseInfo.error = RadioError::INVALID_RESPONSE;
             } else {
                 dataRegResponse.regState = (RegState) dataRegState->regState;
-                dataRegResponse.rat = dataRegState->rat;;
+                dataRegResponse.rat = dataRegState->rat;
                 dataRegResponse.reasonDataDenied = dataRegState->reasonDataDenied;
                 dataRegResponse.maxDataCalls = dataRegState->maxDataCalls;
                 fillCellIdentityResponse(dataRegResponse.cellIdentity, dataRegState->cellIdentity);
@@ -4825,8 +4843,8 @@
         }
 
         Return<void> retStatus =
-                radioService[slotId]->mRadioResponse->getDataRegistrationStateResponse(responseInfo,
-                dataRegResponse);
+                radioService[slotId]->mRadioResponse->getDataRegistrationStateResponse(
+                        responseInfo, dataRegResponse);
         radioService[slotId]->checkReturnStatus(retStatus);
     } else {
         RLOGE("getDataRegistrationStateResponse: radioService[%d]->mRadioResponse == NULL",