commit 1f65269b436f3e878052f365f007a978710f193d
author Amit Mahajan <amitmahajan@google.com> Wed Mar 01 12:08:46 2017 -0800
committer Amit Mahajan <amitmahajan@google.com> Thu Mar 02 12:41:46 2017 -0800
tree 1480c8e18b827ef4f5828e9ba9adf2320b549f05
parent 7d07f2d0ef90ad5bc21cf5e46b832fa36e77b1d6

Cleanup for radioStateChanged.

Test: Basic telephony sanity
Bug: 32020264
Change-Id: I7b7675406409dbb92c3559499665fbe59030573b

libril/ril_service.cpp

diff --git a/libril/ril_service.cpp b/libril/ril_service.cpp
index 952b966..c186459 100644
--- a/libril/ril_service.cpp
+++ b/libril/ril_service.cpp
@@ -5785,15 +5785,20 @@
             (RadioIndicationType::UNSOLICITED_ACK_EXP);
 }
 
-void radio::radioStateChangedInd(int slotId, int indicationType, RIL_RadioState radioState) {
+int radio::radioStateChangedInd(android::Parcel &p, int slotId, int requestNumber,
+                                 int indicationType, int token, RIL_Errno e, void *response,
+                                 size_t responseLen) {
     if (radioService[slotId] != NULL && radioService[slotId]->mRadioIndication != NULL) {
+        RadioState radioState = (RadioState) s_vendorFunctions->onStateRequest();
         RLOGD("radio::radioStateChangedInd: radioState %d", radioState);
         Return<void> retStatus = radioService[slotId]->mRadioIndication->radioStateChanged(
-                convertIntToRadioIndicationType(indicationType), (RadioState) radioState);
+                convertIntToRadioIndicationType(indicationType), radioState);
         radioService[slotId]->checkReturnStatus(retStatus);
     } else {
         RLOGE("radio::radioStateChangedInd: radioService[%d]->mRadioIndication == NULL", slotId);
     }
+
+    return 0;
 }
 
 int radio::callStateChangedInd(android::Parcel &p, int slotId, int requestNumber,
@@ -5812,8 +5817,8 @@
 }
 
 int radio::networkStateChangedInd(android::Parcel &p, int slotId, int requestNumber,
-                                       int indicationType, int token, RIL_Errno e, void *response,
-                                       size_t responseLen) {
+                                  int indicationType, int token, RIL_Errno e, void *response,
+                                  size_t responseLen) {
     if (radioService[slotId] != NULL && radioService[slotId]->mRadioIndication != NULL) {
         RLOGD("radio::networkStateChangedInd");
         Return<void> retStatus = radioService[slotId]->mRadioIndication->networkStateChanged(