Merge "Fix bug in getCallWaiting api."
diff --git a/libril/ril.cpp b/libril/ril.cpp
index a4edf99..4748915 100644
--- a/libril/ril.cpp
+++ b/libril/ril.cpp
@@ -89,7 +89,7 @@
typedef struct {
int requestNumber;
- int (*responseFunction) (Parcel &p, int slotId, int requestNumber, int responseType, int token,
+ int (*responseFunction) (int slotId, int responseType, int token,
RIL_Errno e, void *response, size_t responselen);
WakeType wakeType;
} UnsolResponseInfo;
@@ -191,82 +191,6 @@
#endif
/*******************************************************************/
-static int sendResponse (Parcel &p, RIL_SOCKET_ID socket_id);
-
-static void dispatchVoid (Parcel& p, RequestInfo *pRI);
-static void dispatchString (Parcel& p, RequestInfo *pRI);
-static void dispatchStrings (Parcel& p, RequestInfo *pRI);
-static void dispatchInts (Parcel& p, RequestInfo *pRI);
-static void dispatchDial (Parcel& p, RequestInfo *pRI);
-static void dispatchSIM_IO (Parcel& p, RequestInfo *pRI);
-static void dispatchSIM_APDU (Parcel& p, RequestInfo *pRI);
-static void dispatchCallForward(Parcel& p, RequestInfo *pRI);
-static void dispatchRaw(Parcel& p, RequestInfo *pRI);
-static void dispatchSmsWrite (Parcel &p, RequestInfo *pRI);
-static void dispatchDataCall (Parcel& p, RequestInfo *pRI);
-static void dispatchSetInitialAttachApn (Parcel& p, RequestInfo *pRI);
-static void dispatchCdmaSms(Parcel &p, RequestInfo *pRI);
-static void dispatchImsSms(Parcel &p, RequestInfo *pRI);
-static void dispatchImsCdmaSms(Parcel &p, RequestInfo *pRI, uint8_t retry, int32_t messageRef);
-static void dispatchImsGsmSms(Parcel &p, RequestInfo *pRI, uint8_t retry, int32_t messageRef);
-static void dispatchCdmaSmsAck(Parcel &p, RequestInfo *pRI);
-static void dispatchGsmBrSmsCnf(Parcel &p, RequestInfo *pRI);
-static void dispatchCdmaBrSmsCnf(Parcel &p, RequestInfo *pRI);
-static void dispatchRilCdmaSmsWriteArgs(Parcel &p, RequestInfo *pRI);
-static void dispatchNVReadItem(Parcel &p, RequestInfo *pRI);
-static void dispatchNVWriteItem(Parcel &p, RequestInfo *pRI);
-static void dispatchUiccSubscripton(Parcel &p, RequestInfo *pRI);
-static void dispatchSimAuthentication(Parcel &p, RequestInfo *pRI);
-static void dispatchDataProfile(Parcel &p, RequestInfo *pRI);
-static void dispatchRadioCapability(Parcel &p, RequestInfo *pRI);
-static void dispatchCarrierRestrictions(Parcel &p, RequestInfo *pRI);
-static int responseInts(Parcel &p, int slotId, int requestNumber, int responseType, int token,
- RIL_Errno e, void *response, size_t responselen);
-static int responseFailCause(Parcel &p, int slotId, int requestNumber, int responseType, int token,
- RIL_Errno e, void *response, size_t responselen);
-static int responseStrings(Parcel &p, int slotId, int requestNumber, int responseType, int token,
- RIL_Errno e, void *response, size_t responselen);
-static int responseString(Parcel &p, int slotId, int requestNumber, int responseType, int token,
- RIL_Errno e, void *response, size_t responselen);
-static int responseVoid(Parcel &p, int slotId, int requestNumber, int responseType, int token,
- RIL_Errno e, void *response, size_t responselen);
-static int responseCallList(Parcel &p, int slotId, int requestNumber, int responseType, int token,
- RIL_Errno e, void *response, size_t responselen);
-static int responseSMS(Parcel &p, int slotId, int requestNumber, int responseType, int token,
- RIL_Errno e, void *response, size_t responselen);
-static int responseRaw(Parcel &p, int slotId, int requestNumber, int responseType, int token,
- RIL_Errno e, void *response, size_t responselen);
-static int responseSsn(Parcel &p, int slotId, int requestNumber, int responseType, int token,
- RIL_Errno e, void *response, size_t responselen);
-static int responseCdmaSms(Parcel &p, int slotId, int requestNumber, int responseType, int token,
- RIL_Errno e, void *response, size_t responselen);
-static int responseCdmaInformationRecords(Parcel &p, int slotId, int requestNumber,
- int responseType, int token, RIL_Errno e,void *response, size_t responselen);
-static int responseRilSignalStrength(Parcel &p, int slotId, int requestNumber, int responseType,
- int token, RIL_Errno e,void *response, size_t responselen);
-static int responseCallRing(Parcel &p, int slotId, int requestNumber, int responseType, int token,
- RIL_Errno e, void *response, size_t responselen);
-static int responseCdmaSignalInfoRecord(Parcel &p, int slotId, int requestNumber, int responseType,
- int token, RIL_Errno e,void *response, size_t responselen);
-static int responseCdmaCallWaiting(Parcel &p, int slotId, int requestNumber, int responseType,
- int token, RIL_Errno e,void *response, size_t responselen);
-static int responseSimRefresh(Parcel &p, int slotId, int requestNumber, int responseType, int token,
- RIL_Errno e, void *response, size_t responselen);
-static int responseCellInfoList(Parcel &p, int slotId, int requestNumber, int responseType,
- int token, RIL_Errno e, void *response, size_t responselen);
-static int responseHardwareConfig(Parcel &p, int slotId, int requestNumber, int responseType,
- int token, RIL_Errno e, void *response, size_t responselen);
-static int responseDcRtInfo(Parcel &p, int slotId, int requestNumber, int responseType, int token,
- RIL_Errno e, void *response, size_t responselen);
-static int responseRadioCapability(Parcel &p, int slotId, int requestNumber, int responseType,
- int token, RIL_Errno e, void *response, size_t responselen);
-static int responseSSData(Parcel &p, int slotId, int requestNumber, int responseType, int token,
- RIL_Errno e, void *response, size_t responselen);
-static int responseLceData(Parcel &p, int slotId, int requestNumber, int responseType, int token,
- RIL_Errno e, void *response, size_t responselen);
-static int responsePcoData(Parcel &p, int slotId, int requestNumber, int responseType, int token,
- RIL_Errno e, void *response, size_t responselen);
-
static void grabPartialWakeLock();
void releaseWakeLock();
static void wakeTimeoutCallback(void *);
@@ -315,45 +239,6 @@
strncpy(rild, s, MAX_SOCKET_NAME_LENGTH);
}
-static char *
-strdupReadString(Parcel &p) {
- size_t stringlen;
- const char16_t *s16;
-
- s16 = p.readString16Inplace(&stringlen);
-
- return strndup16to8(s16, stringlen);
-}
-
-static status_t
-readStringFromParcelInplace(Parcel &p, char *str, size_t maxLen) {
- size_t s16Len;
- const char16_t *s16;
-
- s16 = p.readString16Inplace(&s16Len);
- if (s16 == NULL) {
- return NO_MEMORY;
- }
- size_t strLen = strnlen16to8(s16, s16Len);
- if ((strLen + 1) > maxLen) {
- return NO_MEMORY;
- }
- if (strncpy16to8(str, s16, strLen) == NULL) {
- return NO_MEMORY;
- } else {
- return NO_ERROR;
- }
-}
-
-static void writeStringToParcel(Parcel &p, const char *s) {
- char16_t *s16;
- size_t s16_len;
- s16 = strdup8to16(s, &s16_len);
- p.writeString16(s16, s16_len);
- free(s16);
-}
-
-
static void
memsetString (char *s) {
if (s != NULL) {
@@ -361,12 +246,6 @@
}
}
-void nullParcelReleaseFunction (const uint8_t* data, size_t dataSize,
- const size_t* objects, size_t objectsSize,
- void* cookie) {
- // do nothing -- the data reference lives longer than the Parcel object
-}
-
/**
* To be called from dispatch thread
* Issue a single local request, ensuring that the response
@@ -418,88 +297,6 @@
static int
processCommandBuffer(void *buffer, size_t buflen, RIL_SOCKET_ID socket_id) {
- Parcel p;
- status_t status;
- int32_t request;
- int32_t token;
- RequestInfo *pRI;
- int ret;
- /* Hook for current context */
- /* pendingRequestsMutextHook refer to &s_pendingRequestsMutex */
- pthread_mutex_t* pendingRequestsMutexHook = &s_pendingRequestsMutex;
- /* pendingRequestsHook refer to &s_pendingRequests */
- RequestInfo** pendingRequestsHook = &s_pendingRequests;
-
- p.setData((uint8_t *) buffer, buflen);
-
- // status checked at end
- status = p.readInt32(&request);
- status = p.readInt32 (&token);
-
-#if (SIM_COUNT >= 2)
- if (socket_id == RIL_SOCKET_2) {
- pendingRequestsMutexHook = &s_pendingRequestsMutex_socket2;
- pendingRequestsHook = &s_pendingRequests_socket2;
- }
-#if (SIM_COUNT >= 3)
- else if (socket_id == RIL_SOCKET_3) {
- pendingRequestsMutexHook = &s_pendingRequestsMutex_socket3;
- pendingRequestsHook = &s_pendingRequests_socket3;
- }
-#endif
-#if (SIM_COUNT >= 4)
- else if (socket_id == RIL_SOCKET_4) {
- pendingRequestsMutexHook = &s_pendingRequestsMutex_socket4;
- pendingRequestsHook = &s_pendingRequests_socket4;
- }
-#endif
-#endif
-
- if (status != NO_ERROR) {
- RLOGE("invalid request block");
- return 0;
- }
-
- // Received an Ack for the previous result sent to RIL.java,
- // so release wakelock and exit
- if (request == RIL_RESPONSE_ACKNOWLEDGEMENT) {
- releaseWakeLock();
- return 0;
- }
-
- if (request < 1 || request >= (int32_t)NUM_ELEMS(s_commands)) {
- Parcel pErr;
- RLOGE("unsupported request code %d token %d", request, token);
- // FIXME this should perhaps return a response
- pErr.writeInt32 (RESPONSE_SOLICITED);
- pErr.writeInt32 (token);
- pErr.writeInt32 (RIL_E_GENERIC_FAILURE);
-
- sendResponse(pErr, socket_id);
- return 0;
- }
-
- pRI = (RequestInfo *)calloc(1, sizeof(RequestInfo));
- if (pRI == NULL) {
- RLOGE("Memory allocation failed for request %s", requestToString(request));
- return 0;
- }
-
- pRI->token = token;
- pRI->pCI = &(s_commands[request]);
- pRI->socket_id = socket_id;
-
- ret = pthread_mutex_lock(pendingRequestsMutexHook);
- assert (ret == 0);
-
- pRI->p_next = *pendingRequestsHook;
- *pendingRequestsHook = pRI;
-
- ret = pthread_mutex_unlock(pendingRequestsMutexHook);
- assert (ret == 0);
-
- pRI->pCI->dispatchFunction(p, pRI);
-
return 0;
}
@@ -561,1602 +358,6 @@
pRI->token, requestToString(pRI->pCI->requestNumber));
}
-/** Callee expects NULL */
-static void
-dispatchVoid (Parcel& p, RequestInfo *pRI) {
- clearPrintBuf;
- printRequest(pRI->token, pRI->pCI->requestNumber);
- CALL_ONREQUEST(pRI->pCI->requestNumber, NULL, 0, pRI, pRI->socket_id);
-}
-
-/** Callee expects const char * */
-static void
-dispatchString (Parcel& p, RequestInfo *pRI) {
- status_t status;
- size_t datalen;
- size_t stringlen;
- char *string8 = NULL;
-
- string8 = strdupReadString(p);
-
- startRequest;
- appendPrintBuf("%s%s", printBuf, string8);
- closeRequest;
- printRequest(pRI->token, pRI->pCI->requestNumber);
-
- CALL_ONREQUEST(pRI->pCI->requestNumber, string8,
- sizeof(char *), pRI, pRI->socket_id);
-
-#ifdef MEMSET_FREED
- memsetString(string8);
-#endif
-
- free(string8);
- return;
-invalid:
- invalidCommandBlock(pRI);
- return;
-}
-
-/** Callee expects const char ** */
-static void
-dispatchStrings (Parcel &p, RequestInfo *pRI) {
- int32_t countStrings;
- status_t status;
- size_t datalen;
- char **pStrings;
-
- status = p.readInt32 (&countStrings);
-
- if (status != NO_ERROR) {
- goto invalid;
- }
-
- startRequest;
- if (countStrings == 0) {
- // just some non-null pointer
- pStrings = (char **)calloc(1, sizeof(char *));
- if (pStrings == NULL) {
- RLOGE("Memory allocation failed for request %s",
- requestToString(pRI->pCI->requestNumber));
- closeRequest;
- return;
- }
-
- datalen = 0;
- } else if (countStrings < 0) {
- pStrings = NULL;
- datalen = 0;
- } else {
- datalen = sizeof(char *) * countStrings;
-
- pStrings = (char **)calloc(countStrings, sizeof(char *));
- if (pStrings == NULL) {
- RLOGE("Memory allocation failed for request %s",
- requestToString(pRI->pCI->requestNumber));
- closeRequest;
- return;
- }
-
- for (int i = 0 ; i < countStrings ; i++) {
- pStrings[i] = strdupReadString(p);
- appendPrintBuf("%s%s,", printBuf, pStrings[i]);
- }
- }
- removeLastChar;
- closeRequest;
- printRequest(pRI->token, pRI->pCI->requestNumber);
-
- CALL_ONREQUEST(pRI->pCI->requestNumber, pStrings, datalen, pRI, pRI->socket_id);
-
- if (pStrings != NULL) {
- for (int i = 0 ; i < countStrings ; i++) {
-#ifdef MEMSET_FREED
- memsetString (pStrings[i]);
-#endif
- free(pStrings[i]);
- }
-
-#ifdef MEMSET_FREED
- memset(pStrings, 0, datalen);
-#endif
- free(pStrings);
- }
-
- return;
-invalid:
- invalidCommandBlock(pRI);
- return;
-}
-
-/** Callee expects const int * */
-static void
-dispatchInts (Parcel &p, RequestInfo *pRI) {
- int32_t count;
- status_t status;
- size_t datalen;
- int *pInts;
-
- status = p.readInt32 (&count);
-
- if (status != NO_ERROR || count <= 0) {
- goto invalid;
- }
-
- datalen = sizeof(int) * count;
- pInts = (int *)calloc(count, sizeof(int));
- if (pInts == NULL) {
- RLOGE("Memory allocation failed for request %s", requestToString(pRI->pCI->requestNumber));
- return;
- }
-
- startRequest;
- for (int i = 0 ; i < count ; i++) {
- int32_t t;
-
- status = p.readInt32(&t);
- pInts[i] = (int)t;
- appendPrintBuf("%s%d,", printBuf, t);
-
- if (status != NO_ERROR) {
- free(pInts);
- goto invalid;
- }
- }
- removeLastChar;
- closeRequest;
- printRequest(pRI->token, pRI->pCI->requestNumber);
-
- CALL_ONREQUEST(pRI->pCI->requestNumber, const_cast<int *>(pInts),
- datalen, pRI, pRI->socket_id);
-
-#ifdef MEMSET_FREED
- memset(pInts, 0, datalen);
-#endif
- free(pInts);
- return;
-invalid:
- invalidCommandBlock(pRI);
- return;
-}
-
-
-/**
- * Callee expects const RIL_SMS_WriteArgs *
- * Payload is:
- * int32_t status
- * String pdu
- */
-static void
-dispatchSmsWrite (Parcel &p, RequestInfo *pRI) {
- RIL_SMS_WriteArgs args;
- int32_t t;
- status_t status;
-
- RLOGD("dispatchSmsWrite");
- memset (&args, 0, sizeof(args));
-
- status = p.readInt32(&t);
- args.status = (int)t;
-
- args.pdu = strdupReadString(p);
-
- if (status != NO_ERROR || args.pdu == NULL) {
- goto invalid;
- }
-
- args.smsc = strdupReadString(p);
-
- startRequest;
- appendPrintBuf("%s%d,%s,smsc=%s", printBuf, args.status,
- (char*)args.pdu, (char*)args.smsc);
- closeRequest;
- printRequest(pRI->token, pRI->pCI->requestNumber);
-
- CALL_ONREQUEST(pRI->pCI->requestNumber, &args, sizeof(args), pRI, pRI->socket_id);
-
-#ifdef MEMSET_FREED
- memsetString (args.pdu);
-#endif
-
- free (args.pdu);
-
-#ifdef MEMSET_FREED
- memset(&args, 0, sizeof(args));
-#endif
-
- return;
-invalid:
- invalidCommandBlock(pRI);
- return;
-}
-
-/**
- * Callee expects const RIL_Dial *
- * Payload is:
- * String address
- * int32_t clir
- */
-static void
-dispatchDial (Parcel &p, RequestInfo *pRI) {
- RIL_Dial dial;
- RIL_UUS_Info uusInfo;
- int32_t sizeOfDial;
- int32_t t;
- int32_t uusPresent;
- status_t status;
-
- RLOGD("dispatchDial");
- memset (&dial, 0, sizeof(dial));
-
- dial.address = strdupReadString(p);
-
- status = p.readInt32(&t);
- dial.clir = (int)t;
-
- if (status != NO_ERROR || dial.address == NULL) {
- goto invalid;
- }
-
- if (s_callbacks.version < 3) { // Remove when partners upgrade to version 3
- uusPresent = 0;
- sizeOfDial = sizeof(dial) - sizeof(RIL_UUS_Info *);
- } else {
- status = p.readInt32(&uusPresent);
-
- if (status != NO_ERROR) {
- goto invalid;
- }
-
- if (uusPresent == 0) {
- dial.uusInfo = NULL;
- } else {
- int32_t len;
-
- memset(&uusInfo, 0, sizeof(RIL_UUS_Info));
-
- status = p.readInt32(&t);
- uusInfo.uusType = (RIL_UUS_Type) t;
-
- status = p.readInt32(&t);
- uusInfo.uusDcs = (RIL_UUS_DCS) t;
-
- status = p.readInt32(&len);
- if (status != NO_ERROR) {
- goto invalid;
- }
-
- // The java code writes -1 for null arrays
- if (((int) len) == -1) {
- uusInfo.uusData = NULL;
- len = 0;
- } else {
- uusInfo.uusData = (char*) p.readInplace(len);
- }
-
- uusInfo.uusLength = len;
- dial.uusInfo = &uusInfo;
- }
- sizeOfDial = sizeof(dial);
- }
-
- startRequest;
- appendPrintBuf("%snum=%s,clir=%d", printBuf, dial.address, dial.clir);
- if (uusPresent) {
- appendPrintBuf("%s,uusType=%d,uusDcs=%d,uusLen=%d", printBuf,
- dial.uusInfo->uusType, dial.uusInfo->uusDcs,
- dial.uusInfo->uusLength);
- }
- closeRequest;
- printRequest(pRI->token, pRI->pCI->requestNumber);
-
- CALL_ONREQUEST(pRI->pCI->requestNumber, &dial, sizeOfDial, pRI, pRI->socket_id);
-
-#ifdef MEMSET_FREED
- memsetString (dial.address);
-#endif
-
- free (dial.address);
-
-#ifdef MEMSET_FREED
- memset(&uusInfo, 0, sizeof(RIL_UUS_Info));
- memset(&dial, 0, sizeof(dial));
-#endif
-
- return;
-invalid:
- invalidCommandBlock(pRI);
- return;
-}
-
-/**
- * Callee expects const RIL_SIM_IO *
- * Payload is:
- * int32_t command
- * int32_t fileid
- * String path
- * int32_t p1, p2, p3
- * String data
- * String pin2
- * String aidPtr
- */
-static void
-dispatchSIM_IO (Parcel &p, RequestInfo *pRI) {
- union RIL_SIM_IO {
- RIL_SIM_IO_v6 v6;
- RIL_SIM_IO_v5 v5;
- } simIO;
-
- int32_t t;
- int size;
- status_t status;
-
-#if VDBG
- RLOGD("dispatchSIM_IO");
-#endif
- memset (&simIO, 0, sizeof(simIO));
-
- // note we only check status at the end
-
- status = p.readInt32(&t);
- simIO.v6.command = (int)t;
-
- status = p.readInt32(&t);
- simIO.v6.fileid = (int)t;
-
- simIO.v6.path = strdupReadString(p);
-
- status = p.readInt32(&t);
- simIO.v6.p1 = (int)t;
-
- status = p.readInt32(&t);
- simIO.v6.p2 = (int)t;
-
- status = p.readInt32(&t);
- simIO.v6.p3 = (int)t;
-
- simIO.v6.data = strdupReadString(p);
- simIO.v6.pin2 = strdupReadString(p);
- simIO.v6.aidPtr = strdupReadString(p);
-
- startRequest;
- appendPrintBuf("%scmd=0x%X,efid=0x%X,path=%s,%d,%d,%d,%s,pin2=%s,aid=%s", printBuf,
- simIO.v6.command, simIO.v6.fileid, (char*)simIO.v6.path,
- simIO.v6.p1, simIO.v6.p2, simIO.v6.p3,
- (char*)simIO.v6.data, (char*)simIO.v6.pin2, simIO.v6.aidPtr);
- closeRequest;
- printRequest(pRI->token, pRI->pCI->requestNumber);
-
- if (status != NO_ERROR) {
- goto invalid;
- }
-
- size = (s_callbacks.version < 6) ? sizeof(simIO.v5) : sizeof(simIO.v6);
- CALL_ONREQUEST(pRI->pCI->requestNumber, &simIO, size, pRI, pRI->socket_id);
-
-#ifdef MEMSET_FREED
- memsetString (simIO.v6.path);
- memsetString (simIO.v6.data);
- memsetString (simIO.v6.pin2);
- memsetString (simIO.v6.aidPtr);
-#endif
-
- free (simIO.v6.path);
- free (simIO.v6.data);
- free (simIO.v6.pin2);
- free (simIO.v6.aidPtr);
-
-#ifdef MEMSET_FREED
- memset(&simIO, 0, sizeof(simIO));
-#endif
-
- return;
-invalid:
- invalidCommandBlock(pRI);
- return;
-}
-
-/**
- * Callee expects const RIL_SIM_APDU *
- * Payload is:
- * int32_t sessionid
- * int32_t cla
- * int32_t instruction
- * int32_t p1, p2, p3
- * String data
- */
-static void
-dispatchSIM_APDU (Parcel &p, RequestInfo *pRI) {
- int32_t t;
- status_t status;
- RIL_SIM_APDU apdu;
-
-#if VDBG
- RLOGD("dispatchSIM_APDU");
-#endif
- memset (&apdu, 0, sizeof(RIL_SIM_APDU));
-
- // Note we only check status at the end. Any single failure leads to
- // subsequent reads filing.
- status = p.readInt32(&t);
- apdu.sessionid = (int)t;
-
- status = p.readInt32(&t);
- apdu.cla = (int)t;
-
- status = p.readInt32(&t);
- apdu.instruction = (int)t;
-
- status = p.readInt32(&t);
- apdu.p1 = (int)t;
-
- status = p.readInt32(&t);
- apdu.p2 = (int)t;
-
- status = p.readInt32(&t);
- apdu.p3 = (int)t;
-
- apdu.data = strdupReadString(p);
-
- startRequest;
- appendPrintBuf("%ssessionid=%d,cla=%d,ins=%d,p1=%d,p2=%d,p3=%d,data=%s",
- printBuf, apdu.sessionid, apdu.cla, apdu.instruction, apdu.p1, apdu.p2,
- apdu.p3, (char*)apdu.data);
- closeRequest;
- printRequest(pRI->token, pRI->pCI->requestNumber);
-
- if (status != NO_ERROR) {
- goto invalid;
- }
-
- CALL_ONREQUEST(pRI->pCI->requestNumber, &apdu, sizeof(RIL_SIM_APDU), pRI, pRI->socket_id);
-
-#ifdef MEMSET_FREED
- memsetString(apdu.data);
-#endif
- free(apdu.data);
-
-#ifdef MEMSET_FREED
- memset(&apdu, 0, sizeof(RIL_SIM_APDU));
-#endif
-
- return;
-invalid:
- invalidCommandBlock(pRI);
- return;
-}
-
-
-/**
- * Callee expects const RIL_CallForwardInfo *
- * Payload is:
- * int32_t status/action
- * int32_t reason
- * int32_t serviceCode
- * int32_t toa
- * String number (0 length -> null)
- * int32_t timeSeconds
- */
-static void
-dispatchCallForward(Parcel &p, RequestInfo *pRI) {
- RIL_CallForwardInfo cff;
- int32_t t;
- status_t status;
-
- RLOGD("dispatchCallForward");
- memset (&cff, 0, sizeof(cff));
-
- // note we only check status at the end
-
- status = p.readInt32(&t);
- cff.status = (int)t;
-
- status = p.readInt32(&t);
- cff.reason = (int)t;
-
- status = p.readInt32(&t);
- cff.serviceClass = (int)t;
-
- status = p.readInt32(&t);
- cff.toa = (int)t;
-
- cff.number = strdupReadString(p);
-
- status = p.readInt32(&t);
- cff.timeSeconds = (int)t;
-
- if (status != NO_ERROR) {
- goto invalid;
- }
-
- // special case: number 0-length fields is null
-
- if (cff.number != NULL && strlen (cff.number) == 0) {
- cff.number = NULL;
- }
-
- startRequest;
- appendPrintBuf("%sstat=%d,reason=%d,serv=%d,toa=%d,%s,tout=%d", printBuf,
- cff.status, cff.reason, cff.serviceClass, cff.toa,
- (char*)cff.number, cff.timeSeconds);
- closeRequest;
- printRequest(pRI->token, pRI->pCI->requestNumber);
-
- CALL_ONREQUEST(pRI->pCI->requestNumber, &cff, sizeof(cff), pRI, pRI->socket_id);
-
-#ifdef MEMSET_FREED
- memsetString(cff.number);
-#endif
-
- free (cff.number);
-
-#ifdef MEMSET_FREED
- memset(&cff, 0, sizeof(cff));
-#endif
-
- return;
-invalid:
- invalidCommandBlock(pRI);
- return;
-}
-
-
-static void
-dispatchRaw(Parcel &p, RequestInfo *pRI) {
- int32_t len;
- status_t status;
- const void *data;
-
- status = p.readInt32(&len);
-
- if (status != NO_ERROR) {
- goto invalid;
- }
-
- // The java code writes -1 for null arrays
- if (((int)len) == -1) {
- data = NULL;
- len = 0;
- }
-
- data = p.readInplace(len);
-
- startRequest;
- appendPrintBuf("%sraw_size=%d", printBuf, len);
- closeRequest;
- printRequest(pRI->token, pRI->pCI->requestNumber);
-
- CALL_ONREQUEST(pRI->pCI->requestNumber, const_cast<void *>(data), len, pRI, pRI->socket_id);
-
- return;
-invalid:
- invalidCommandBlock(pRI);
- return;
-}
-
-static status_t
-constructCdmaSms(Parcel &p, RequestInfo *pRI, RIL_CDMA_SMS_Message& rcsm) {
- int32_t t;
- uint8_t ut;
- status_t status;
- int32_t digitCount;
- int digitLimit;
-
- memset(&rcsm, 0, sizeof(rcsm));
-
- status = p.readInt32(&t);
- rcsm.uTeleserviceID = (int) t;
-
- status = p.read(&ut,sizeof(ut));
- rcsm.bIsServicePresent = (uint8_t) ut;
-
- status = p.readInt32(&t);
- rcsm.uServicecategory = (int) t;
-
- status = p.readInt32(&t);
- rcsm.sAddress.digit_mode = (RIL_CDMA_SMS_DigitMode) t;
-
- status = p.readInt32(&t);
- rcsm.sAddress.number_mode = (RIL_CDMA_SMS_NumberMode) t;
-
- status = p.readInt32(&t);
- rcsm.sAddress.number_type = (RIL_CDMA_SMS_NumberType) t;
-
- status = p.readInt32(&t);
- rcsm.sAddress.number_plan = (RIL_CDMA_SMS_NumberPlan) t;
-
- status = p.read(&ut,sizeof(ut));
- rcsm.sAddress.number_of_digits= (uint8_t) ut;
-
- digitLimit= MIN((rcsm.sAddress.number_of_digits), RIL_CDMA_SMS_ADDRESS_MAX);
- for(digitCount =0 ; digitCount < digitLimit; digitCount ++) {
- status = p.read(&ut,sizeof(ut));
- rcsm.sAddress.digits[digitCount] = (uint8_t) ut;
- }
-
- status = p.readInt32(&t);
- rcsm.sSubAddress.subaddressType = (RIL_CDMA_SMS_SubaddressType) t;
-
- status = p.read(&ut,sizeof(ut));
- rcsm.sSubAddress.odd = (uint8_t) ut;
-
- status = p.read(&ut,sizeof(ut));
- rcsm.sSubAddress.number_of_digits = (uint8_t) ut;
-
- digitLimit= MIN((rcsm.sSubAddress.number_of_digits), RIL_CDMA_SMS_SUBADDRESS_MAX);
- for(digitCount =0 ; digitCount < digitLimit; digitCount ++) {
- status = p.read(&ut,sizeof(ut));
- rcsm.sSubAddress.digits[digitCount] = (uint8_t) ut;
- }
-
- status = p.readInt32(&t);
- rcsm.uBearerDataLen = (int) t;
-
- digitLimit= MIN((rcsm.uBearerDataLen), RIL_CDMA_SMS_BEARER_DATA_MAX);
- for(digitCount =0 ; digitCount < digitLimit; digitCount ++) {
- status = p.read(&ut, sizeof(ut));
- rcsm.aBearerData[digitCount] = (uint8_t) ut;
- }
-
- if (status != NO_ERROR) {
- return status;
- }
-
- startRequest;
- appendPrintBuf("%suTeleserviceID=%d, bIsServicePresent=%d, uServicecategory=%d, \
- sAddress.digit_mode=%d, sAddress.Number_mode=%d, sAddress.number_type=%d, ",
- printBuf, rcsm.uTeleserviceID,rcsm.bIsServicePresent,rcsm.uServicecategory,
- rcsm.sAddress.digit_mode, rcsm.sAddress.number_mode,rcsm.sAddress.number_type);
- closeRequest;
-
- printRequest(pRI->token, pRI->pCI->requestNumber);
-
- return status;
-}
-
-static void
-dispatchCdmaSms(Parcel &p, RequestInfo *pRI) {
- RIL_CDMA_SMS_Message rcsm;
-
- RLOGD("dispatchCdmaSms");
- if (NO_ERROR != constructCdmaSms(p, pRI, rcsm)) {
- goto invalid;
- }
-
- CALL_ONREQUEST(pRI->pCI->requestNumber, &rcsm, sizeof(rcsm),pRI, pRI->socket_id);
-
-#ifdef MEMSET_FREED
- memset(&rcsm, 0, sizeof(rcsm));
-#endif
-
- return;
-
-invalid:
- invalidCommandBlock(pRI);
- return;
-}
-
-static void
-dispatchImsCdmaSms(Parcel &p, RequestInfo *pRI, uint8_t retry, int32_t messageRef) {
- RIL_IMS_SMS_Message rism;
- RIL_CDMA_SMS_Message rcsm;
-
- RLOGD("dispatchImsCdmaSms: retry=%d, messageRef=%d", retry, messageRef);
-
- if (NO_ERROR != constructCdmaSms(p, pRI, rcsm)) {
- goto invalid;
- }
- memset(&rism, 0, sizeof(rism));
- rism.tech = RADIO_TECH_3GPP2;
- rism.retry = retry;
- rism.messageRef = messageRef;
- rism.message.cdmaMessage = &rcsm;
-
- CALL_ONREQUEST(pRI->pCI->requestNumber, &rism,
- sizeof(RIL_RadioTechnologyFamily)+sizeof(uint8_t)+sizeof(int32_t)
- +sizeof(rcsm),pRI, pRI->socket_id);
-
-#ifdef MEMSET_FREED
- memset(&rcsm, 0, sizeof(rcsm));
- memset(&rism, 0, sizeof(rism));
-#endif
-
- return;
-
-invalid:
- invalidCommandBlock(pRI);
- return;
-}
-
-static void
-dispatchImsGsmSms(Parcel &p, RequestInfo *pRI, uint8_t retry, int32_t messageRef) {
- RIL_IMS_SMS_Message rism;
- int32_t countStrings;
- status_t status;
- size_t datalen;
- char **pStrings;
- RLOGD("dispatchImsGsmSms: retry=%d, messageRef=%d", retry, messageRef);
-
- status = p.readInt32 (&countStrings);
-
- if (status != NO_ERROR) {
- goto invalid;
- }
-
- memset(&rism, 0, sizeof(rism));
- rism.tech = RADIO_TECH_3GPP;
- rism.retry = retry;
- rism.messageRef = messageRef;
-
- startRequest;
- appendPrintBuf("%stech=%d, retry=%d, messageRef=%d, ", printBuf,
- (int)rism.tech, (int)rism.retry, rism.messageRef);
- if (countStrings == 0) {
- // just some non-null pointer
- pStrings = (char **)calloc(1, sizeof(char *));
- if (pStrings == NULL) {
- RLOGE("Memory allocation failed for request %s",
- requestToString(pRI->pCI->requestNumber));
- closeRequest;
- return;
- }
-
- datalen = 0;
- } else if (countStrings < 0) {
- pStrings = NULL;
- datalen = 0;
- } else {
- if ((size_t)countStrings > (INT_MAX/sizeof(char *))) {
- RLOGE("Invalid value of countStrings: \n");
- closeRequest;
- return;
- }
- datalen = sizeof(char *) * countStrings;
-
- pStrings = (char **)calloc(countStrings, sizeof(char *));
- if (pStrings == NULL) {
- RLOGE("Memory allocation failed for request %s",
- requestToString(pRI->pCI->requestNumber));
- closeRequest;
- return;
- }
-
- for (int i = 0 ; i < countStrings ; i++) {
- pStrings[i] = strdupReadString(p);
- appendPrintBuf("%s%s,", printBuf, pStrings[i]);
- }
- }
- removeLastChar;
- closeRequest;
- printRequest(pRI->token, pRI->pCI->requestNumber);
-
- rism.message.gsmMessage = pStrings;
- CALL_ONREQUEST(pRI->pCI->requestNumber, &rism,
- sizeof(RIL_RadioTechnologyFamily)+sizeof(uint8_t)+sizeof(int32_t)
- +datalen, pRI, pRI->socket_id);
-
- if (pStrings != NULL) {
- for (int i = 0 ; i < countStrings ; i++) {
-#ifdef MEMSET_FREED
- memsetString (pStrings[i]);
-#endif
- free(pStrings[i]);
- }
-
-#ifdef MEMSET_FREED
- memset(pStrings, 0, datalen);
-#endif
- free(pStrings);
- }
-
-#ifdef MEMSET_FREED
- memset(&rism, 0, sizeof(rism));
-#endif
- return;
-invalid:
- ALOGE("dispatchImsGsmSms invalid block");
- invalidCommandBlock(pRI);
- return;
-}
-
-static void
-dispatchImsSms(Parcel &p, RequestInfo *pRI) {
- int32_t t;
- status_t status = p.readInt32(&t);
- RIL_RadioTechnologyFamily format;
- uint8_t retry;
- int32_t messageRef;
-
- RLOGD("dispatchImsSms");
- if (status != NO_ERROR) {
- goto invalid;
- }
- format = (RIL_RadioTechnologyFamily) t;
-
- // read retry field
- status = p.read(&retry,sizeof(retry));
- if (status != NO_ERROR) {
- goto invalid;
- }
- // read messageRef field
- status = p.read(&messageRef,sizeof(messageRef));
- if (status != NO_ERROR) {
- goto invalid;
- }
-
- if (RADIO_TECH_3GPP == format) {
- dispatchImsGsmSms(p, pRI, retry, messageRef);
- } else if (RADIO_TECH_3GPP2 == format) {
- dispatchImsCdmaSms(p, pRI, retry, messageRef);
- } else {
- ALOGE("requestImsSendSMS invalid format value =%d", format);
- }
-
- return;
-
-invalid:
- invalidCommandBlock(pRI);
- return;
-}
-
-static void
-dispatchCdmaSmsAck(Parcel &p, RequestInfo *pRI) {
- RIL_CDMA_SMS_Ack rcsa;
- int32_t t;
- status_t status;
- int32_t digitCount;
-
- RLOGD("dispatchCdmaSmsAck");
- memset(&rcsa, 0, sizeof(rcsa));
-
- status = p.readInt32(&t);
- rcsa.uErrorClass = (RIL_CDMA_SMS_ErrorClass) t;
-
- status = p.readInt32(&t);
- rcsa.uSMSCauseCode = (int) t;
-
- if (status != NO_ERROR) {
- goto invalid;
- }
-
- startRequest;
- appendPrintBuf("%suErrorClass=%d, uTLStatus=%d, ",
- printBuf, rcsa.uErrorClass, rcsa.uSMSCauseCode);
- closeRequest;
-
- printRequest(pRI->token, pRI->pCI->requestNumber);
-
- CALL_ONREQUEST(pRI->pCI->requestNumber, &rcsa, sizeof(rcsa),pRI, pRI->socket_id);
-
-#ifdef MEMSET_FREED
- memset(&rcsa, 0, sizeof(rcsa));
-#endif
-
- return;
-
-invalid:
- invalidCommandBlock(pRI);
- return;
-}
-
-static void
-dispatchGsmBrSmsCnf(Parcel &p, RequestInfo *pRI) {
- int32_t t;
- status_t status;
- int32_t num;
-
- status = p.readInt32(&num);
- if (status != NO_ERROR) {
- goto invalid;
- }
-
- {
- RIL_GSM_BroadcastSmsConfigInfo gsmBci[num];
- RIL_GSM_BroadcastSmsConfigInfo *gsmBciPtrs[num];
-
- startRequest;
- for (int i = 0 ; i < num ; i++ ) {
- gsmBciPtrs[i] = &gsmBci[i];
-
- status = p.readInt32(&t);
- gsmBci[i].fromServiceId = (int) t;
-
- status = p.readInt32(&t);
- gsmBci[i].toServiceId = (int) t;
-
- status = p.readInt32(&t);
- gsmBci[i].fromCodeScheme = (int) t;
-
- status = p.readInt32(&t);
- gsmBci[i].toCodeScheme = (int) t;
-
- status = p.readInt32(&t);
- gsmBci[i].selected = (uint8_t) t;
-
- appendPrintBuf("%s [%d: fromServiceId=%d, toServiceId =%d, \
- fromCodeScheme=%d, toCodeScheme=%d, selected =%d]", printBuf, i,
- gsmBci[i].fromServiceId, gsmBci[i].toServiceId,
- gsmBci[i].fromCodeScheme, gsmBci[i].toCodeScheme,
- gsmBci[i].selected);
- }
- closeRequest;
-
- if (status != NO_ERROR) {
- goto invalid;
- }
-
- CALL_ONREQUEST(pRI->pCI->requestNumber,
- gsmBciPtrs,
- num * sizeof(RIL_GSM_BroadcastSmsConfigInfo *),
- pRI, pRI->socket_id);
-
-#ifdef MEMSET_FREED
- memset(gsmBci, 0, num * sizeof(RIL_GSM_BroadcastSmsConfigInfo));
- memset(gsmBciPtrs, 0, num * sizeof(RIL_GSM_BroadcastSmsConfigInfo *));
-#endif
- }
-
- return;
-
-invalid:
- invalidCommandBlock(pRI);
- return;
-}
-
-static void
-dispatchCdmaBrSmsCnf(Parcel &p, RequestInfo *pRI) {
- int32_t t;
- status_t status;
- int32_t num;
-
- status = p.readInt32(&num);
- if (status != NO_ERROR) {
- goto invalid;
- }
-
- {
- RIL_CDMA_BroadcastSmsConfigInfo cdmaBci[num];
- RIL_CDMA_BroadcastSmsConfigInfo *cdmaBciPtrs[num];
-
- startRequest;
- for (int i = 0 ; i < num ; i++ ) {
- cdmaBciPtrs[i] = &cdmaBci[i];
-
- status = p.readInt32(&t);
- cdmaBci[i].service_category = (int) t;
-
- status = p.readInt32(&t);
- cdmaBci[i].language = (int) t;
-
- status = p.readInt32(&t);
- cdmaBci[i].selected = (uint8_t) t;
-
- appendPrintBuf("%s [%d: service_category=%d, language =%d, \
- entries.bSelected =%d]", printBuf, i, cdmaBci[i].service_category,
- cdmaBci[i].language, cdmaBci[i].selected);
- }
- closeRequest;
-
- if (status != NO_ERROR) {
- goto invalid;
- }
-
- CALL_ONREQUEST(pRI->pCI->requestNumber,
- cdmaBciPtrs,
- num * sizeof(RIL_CDMA_BroadcastSmsConfigInfo *),
- pRI, pRI->socket_id);
-
-#ifdef MEMSET_FREED
- memset(cdmaBci, 0, num * sizeof(RIL_CDMA_BroadcastSmsConfigInfo));
- memset(cdmaBciPtrs, 0, num * sizeof(RIL_CDMA_BroadcastSmsConfigInfo *));
-#endif
- }
-
- return;
-
-invalid:
- invalidCommandBlock(pRI);
- return;
-}
-
-static void dispatchRilCdmaSmsWriteArgs(Parcel &p, RequestInfo *pRI) {
- RIL_CDMA_SMS_WriteArgs rcsw;
- int32_t t;
- uint32_t ut;
- uint8_t uct;
- status_t status;
- int32_t digitCount;
- int32_t digitLimit;
-
- memset(&rcsw, 0, sizeof(rcsw));
-
- status = p.readInt32(&t);
- rcsw.status = t;
-
- status = p.readInt32(&t);
- rcsw.message.uTeleserviceID = (int) t;
-
- status = p.read(&uct,sizeof(uct));
- rcsw.message.bIsServicePresent = (uint8_t) uct;
-
- status = p.readInt32(&t);
- rcsw.message.uServicecategory = (int) t;
-
- status = p.readInt32(&t);
- rcsw.message.sAddress.digit_mode = (RIL_CDMA_SMS_DigitMode) t;
-
- status = p.readInt32(&t);
- rcsw.message.sAddress.number_mode = (RIL_CDMA_SMS_NumberMode) t;
-
- status = p.readInt32(&t);
- rcsw.message.sAddress.number_type = (RIL_CDMA_SMS_NumberType) t;
-
- status = p.readInt32(&t);
- rcsw.message.sAddress.number_plan = (RIL_CDMA_SMS_NumberPlan) t;
-
- status = p.read(&uct,sizeof(uct));
- rcsw.message.sAddress.number_of_digits = (uint8_t) uct;
-
- digitLimit = MIN((rcsw.message.sAddress.number_of_digits), RIL_CDMA_SMS_ADDRESS_MAX);
-
- for(digitCount = 0 ; digitCount < digitLimit; digitCount ++) {
- status = p.read(&uct,sizeof(uct));
- rcsw.message.sAddress.digits[digitCount] = (uint8_t) uct;
- }
-
- status = p.readInt32(&t);
- rcsw.message.sSubAddress.subaddressType = (RIL_CDMA_SMS_SubaddressType) t;
-
- status = p.read(&uct,sizeof(uct));
- rcsw.message.sSubAddress.odd = (uint8_t) uct;
-
- status = p.read(&uct,sizeof(uct));
- rcsw.message.sSubAddress.number_of_digits = (uint8_t) uct;
-
- digitLimit = MIN((rcsw.message.sSubAddress.number_of_digits), RIL_CDMA_SMS_SUBADDRESS_MAX);
-
- for(digitCount = 0 ; digitCount < digitLimit; digitCount ++) {
- status = p.read(&uct,sizeof(uct));
- rcsw.message.sSubAddress.digits[digitCount] = (uint8_t) uct;
- }
-
- status = p.readInt32(&t);
- rcsw.message.uBearerDataLen = (int) t;
-
- digitLimit = MIN((rcsw.message.uBearerDataLen), RIL_CDMA_SMS_BEARER_DATA_MAX);
-
- for(digitCount = 0 ; digitCount < digitLimit; digitCount ++) {
- status = p.read(&uct, sizeof(uct));
- rcsw.message.aBearerData[digitCount] = (uint8_t) uct;
- }
-
- if (status != NO_ERROR) {
- goto invalid;
- }
-
- startRequest;
- appendPrintBuf("%sstatus=%d, message.uTeleserviceID=%d, message.bIsServicePresent=%d, \
- message.uServicecategory=%d, message.sAddress.digit_mode=%d, \
- message.sAddress.number_mode=%d, \
- message.sAddress.number_type=%d, ",
- printBuf, rcsw.status, rcsw.message.uTeleserviceID, rcsw.message.bIsServicePresent,
- rcsw.message.uServicecategory, rcsw.message.sAddress.digit_mode,
- rcsw.message.sAddress.number_mode,
- rcsw.message.sAddress.number_type);
- closeRequest;
-
- printRequest(pRI->token, pRI->pCI->requestNumber);
-
- CALL_ONREQUEST(pRI->pCI->requestNumber, &rcsw, sizeof(rcsw),pRI, pRI->socket_id);
-
-#ifdef MEMSET_FREED
- memset(&rcsw, 0, sizeof(rcsw));
-#endif
-
- return;
-
-invalid:
- invalidCommandBlock(pRI);
- return;
-
-}
-
-// For backwards compatibility in RIL_REQUEST_SETUP_DATA_CALL.
-// Version 4 of the RIL interface adds a new PDP type parameter to support
-// IPv6 and dual-stack PDP contexts. When dealing with a previous version of
-// RIL, remove the parameter from the request.
-static void dispatchDataCall(Parcel& p, RequestInfo *pRI) {
- // In RIL v3, REQUEST_SETUP_DATA_CALL takes 6 parameters.
- const int numParamsRilV3 = 6;
-
- // The first bytes of the RIL parcel contain the request number and the
- // serial number - see processCommandBuffer(). Copy them over too.
- int pos = p.dataPosition();
-
- int numParams = p.readInt32();
- if (s_callbacks.version < 4 && numParams > numParamsRilV3) {
- Parcel p2;
- p2.appendFrom(&p, 0, pos);
- p2.writeInt32(numParamsRilV3);
- for(int i = 0; i < numParamsRilV3; i++) {
- p2.writeString16(p.readString16());
- }
- p2.setDataPosition(pos);
- dispatchStrings(p2, pRI);
- } else {
- p.setDataPosition(pos);
- dispatchStrings(p, pRI);
- }
-}
-
-static void dispatchSetInitialAttachApn(Parcel &p, RequestInfo *pRI)
-{
- RIL_InitialAttachApn pf;
- int32_t t;
- status_t status;
-
- memset(&pf, 0, sizeof(pf));
-
- pf.apn = strdupReadString(p);
- pf.protocol = strdupReadString(p);
-
- status = p.readInt32(&t);
- pf.authtype = (int) t;
-
- pf.username = strdupReadString(p);
- pf.password = strdupReadString(p);
-
- startRequest;
- appendPrintBuf("%sapn=%s, protocol=%s, authtype=%d, username=%s, password=%s",
- printBuf, pf.apn, pf.protocol, pf.authtype, pf.username, pf.password);
- closeRequest;
- printRequest(pRI->token, pRI->pCI->requestNumber);
-
- if (status != NO_ERROR) {
- goto invalid;
- }
- CALL_ONREQUEST(pRI->pCI->requestNumber, &pf, sizeof(pf), pRI, pRI->socket_id);
-
-#ifdef MEMSET_FREED
- memsetString(pf.apn);
- memsetString(pf.protocol);
- memsetString(pf.username);
- memsetString(pf.password);
-#endif
-
- free(pf.apn);
- free(pf.protocol);
- free(pf.username);
- free(pf.password);
-
-#ifdef MEMSET_FREED
- memset(&pf, 0, sizeof(pf));
-#endif
-
- return;
-invalid:
- invalidCommandBlock(pRI);
- return;
-}
-
-static void dispatchNVReadItem(Parcel &p, RequestInfo *pRI) {
- RIL_NV_ReadItem nvri;
- int32_t t;
- status_t status;
-
- memset(&nvri, 0, sizeof(nvri));
-
- status = p.readInt32(&t);
- nvri.itemID = (RIL_NV_Item) t;
-
- if (status != NO_ERROR) {
- goto invalid;
- }
-
- startRequest;
- appendPrintBuf("%snvri.itemID=%d, ", printBuf, nvri.itemID);
- closeRequest;
-
- printRequest(pRI->token, pRI->pCI->requestNumber);
-
- CALL_ONREQUEST(pRI->pCI->requestNumber, &nvri, sizeof(nvri), pRI, pRI->socket_id);
-
-#ifdef MEMSET_FREED
- memset(&nvri, 0, sizeof(nvri));
-#endif
-
- return;
-
-invalid:
- invalidCommandBlock(pRI);
- return;
-}
-
-static void dispatchNVWriteItem(Parcel &p, RequestInfo *pRI) {
- RIL_NV_WriteItem nvwi;
- int32_t t;
- status_t status;
-
- memset(&nvwi, 0, sizeof(nvwi));
-
- status = p.readInt32(&t);
- nvwi.itemID = (RIL_NV_Item) t;
-
- nvwi.value = strdupReadString(p);
-
- if (status != NO_ERROR || nvwi.value == NULL) {
- goto invalid;
- }
-
- startRequest;
- appendPrintBuf("%snvwi.itemID=%d, value=%s, ", printBuf, nvwi.itemID,
- nvwi.value);
- closeRequest;
-
- printRequest(pRI->token, pRI->pCI->requestNumber);
-
- CALL_ONREQUEST(pRI->pCI->requestNumber, &nvwi, sizeof(nvwi), pRI, pRI->socket_id);
-
-#ifdef MEMSET_FREED
- memsetString(nvwi.value);
-#endif
-
- free(nvwi.value);
-
-#ifdef MEMSET_FREED
- memset(&nvwi, 0, sizeof(nvwi));
-#endif
-
- return;
-
-invalid:
- invalidCommandBlock(pRI);
- return;
-}
-
-
-static void dispatchUiccSubscripton(Parcel &p, RequestInfo *pRI) {
- RIL_SelectUiccSub uicc_sub;
- status_t status;
- int32_t t;
- memset(&uicc_sub, 0, sizeof(uicc_sub));
-
- status = p.readInt32(&t);
- if (status != NO_ERROR) {
- goto invalid;
- }
- uicc_sub.slot = (int) t;
-
- status = p.readInt32(&t);
- if (status != NO_ERROR) {
- goto invalid;
- }
- uicc_sub.app_index = (int) t;
-
- status = p.readInt32(&t);
- if (status != NO_ERROR) {
- goto invalid;
- }
- uicc_sub.sub_type = (RIL_SubscriptionType) t;
-
- status = p.readInt32(&t);
- if (status != NO_ERROR) {
- goto invalid;
- }
- uicc_sub.act_status = (RIL_UiccSubActStatus) t;
-
- startRequest;
- appendPrintBuf("slot=%d, app_index=%d, act_status = %d", uicc_sub.slot, uicc_sub.app_index,
- uicc_sub.act_status);
- RLOGD("dispatchUiccSubscription, slot=%d, app_index=%d, act_status = %d", uicc_sub.slot,
- uicc_sub.app_index, uicc_sub.act_status);
- closeRequest;
- printRequest(pRI->token, pRI->pCI->requestNumber);
-
- CALL_ONREQUEST(pRI->pCI->requestNumber, &uicc_sub, sizeof(uicc_sub), pRI, pRI->socket_id);
-
-#ifdef MEMSET_FREED
- memset(&uicc_sub, 0, sizeof(uicc_sub));
-#endif
- return;
-
-invalid:
- invalidCommandBlock(pRI);
- return;
-}
-
-static void dispatchSimAuthentication(Parcel &p, RequestInfo *pRI)
-{
- RIL_SimAuthentication pf;
- int32_t t;
- status_t status;
-
- memset(&pf, 0, sizeof(pf));
-
- status = p.readInt32(&t);
- pf.authContext = (int) t;
- pf.authData = strdupReadString(p);
- pf.aid = strdupReadString(p);
-
- startRequest;
- appendPrintBuf("authContext=%s, authData=%s, aid=%s", pf.authContext, pf.authData, pf.aid);
- closeRequest;
- printRequest(pRI->token, pRI->pCI->requestNumber);
-
- if (status != NO_ERROR) {
- goto invalid;
- }
- CALL_ONREQUEST(pRI->pCI->requestNumber, &pf, sizeof(pf), pRI, pRI->socket_id);
-
-#ifdef MEMSET_FREED
- memsetString(pf.authData);
- memsetString(pf.aid);
-#endif
-
- free(pf.authData);
- free(pf.aid);
-
-#ifdef MEMSET_FREED
- memset(&pf, 0, sizeof(pf));
-#endif
-
- return;
-invalid:
- invalidCommandBlock(pRI);
- return;
-}
-
-static void dispatchDataProfile(Parcel &p, RequestInfo *pRI) {
- int32_t t;
- status_t status;
- int32_t num;
-
- status = p.readInt32(&num);
- if (status != NO_ERROR || num < 0) {
- goto invalid;
- }
-
- {
- RIL_DataProfileInfo *dataProfiles =
- (RIL_DataProfileInfo *)calloc(num, sizeof(RIL_DataProfileInfo));
- if (dataProfiles == NULL) {
- RLOGE("Memory allocation failed for request %s",
- requestToString(pRI->pCI->requestNumber));
- return;
- }
- RIL_DataProfileInfo **dataProfilePtrs =
- (RIL_DataProfileInfo **)calloc(num, sizeof(RIL_DataProfileInfo *));
- if (dataProfilePtrs == NULL) {
- RLOGE("Memory allocation failed for request %s",
- requestToString(pRI->pCI->requestNumber));
- free(dataProfiles);
- return;
- }
-
- startRequest;
- for (int i = 0 ; i < num ; i++ ) {
- dataProfilePtrs[i] = &dataProfiles[i];
-
- status = p.readInt32(&t);
- dataProfiles[i].profileId = (int) t;
-
- dataProfiles[i].apn = strdupReadString(p);
- dataProfiles[i].protocol = strdupReadString(p);
- status = p.readInt32(&t);
- dataProfiles[i].authType = (int) t;
-
- dataProfiles[i].user = strdupReadString(p);
- dataProfiles[i].password = strdupReadString(p);
-
- status = p.readInt32(&t);
- dataProfiles[i].type = (int) t;
-
- status = p.readInt32(&t);
- dataProfiles[i].maxConnsTime = (int) t;
- status = p.readInt32(&t);
- dataProfiles[i].maxConns = (int) t;
- status = p.readInt32(&t);
- dataProfiles[i].waitTime = (int) t;
-
- status = p.readInt32(&t);
- dataProfiles[i].enabled = (int) t;
-
- appendPrintBuf("%s [%d: profileId=%d, apn =%s, protocol =%s, authType =%d, \
- user =%s, password =%s, type =%d, maxConnsTime =%d, maxConns =%d, \
- waitTime =%d, enabled =%d]", printBuf, i, dataProfiles[i].profileId,
- dataProfiles[i].apn, dataProfiles[i].protocol, dataProfiles[i].authType,
- dataProfiles[i].user, dataProfiles[i].password, dataProfiles[i].type,
- dataProfiles[i].maxConnsTime, dataProfiles[i].maxConns,
- dataProfiles[i].waitTime, dataProfiles[i].enabled);
- }
- closeRequest;
- printRequest(pRI->token, pRI->pCI->requestNumber);
-
- if (status != NO_ERROR) {
- free(dataProfiles);
- free(dataProfilePtrs);
- goto invalid;
- }
- CALL_ONREQUEST(pRI->pCI->requestNumber,
- dataProfilePtrs,
- num * sizeof(RIL_DataProfileInfo *),
- pRI, pRI->socket_id);
-
-#ifdef MEMSET_FREED
- memset(dataProfiles, 0, num * sizeof(RIL_DataProfileInfo));
- memset(dataProfilePtrs, 0, num * sizeof(RIL_DataProfileInfo *));
-#endif
- free(dataProfiles);
- free(dataProfilePtrs);
- }
-
- return;
-
-invalid:
- invalidCommandBlock(pRI);
- return;
-}
-
-static void dispatchRadioCapability(Parcel &p, RequestInfo *pRI){
- RIL_RadioCapability rc;
- int32_t t;
- status_t status;
-
- memset (&rc, 0, sizeof(RIL_RadioCapability));
-
- status = p.readInt32(&t);
- rc.version = (int)t;
- if (status != NO_ERROR) {
- goto invalid;
- }
-
- status = p.readInt32(&t);
- rc.session= (int)t;
- if (status != NO_ERROR) {
- goto invalid;
- }
-
- status = p.readInt32(&t);
- rc.phase= (int)t;
- if (status != NO_ERROR) {
- goto invalid;
- }
-
- status = p.readInt32(&t);
- rc.rat = (int)t;
- if (status != NO_ERROR) {
- goto invalid;
- }
-
- status = readStringFromParcelInplace(p, rc.logicalModemUuid, sizeof(rc.logicalModemUuid));
- if (status != NO_ERROR) {
- goto invalid;
- }
-
- status = p.readInt32(&t);
- rc.status = (int)t;
-
- if (status != NO_ERROR) {
- goto invalid;
- }
-
- startRequest;
- appendPrintBuf("%s [version:%d, session:%d, phase:%d, rat:%d, \
- logicalModemUuid:%s, status:%d", printBuf, rc.version, rc.session,
- rc.phase, rc.rat, rc.logicalModemUuid, rc.session);
-
- closeRequest;
- printRequest(pRI->token, pRI->pCI->requestNumber);
-
- CALL_ONREQUEST(pRI->pCI->requestNumber,
- &rc,
- sizeof(RIL_RadioCapability),
- pRI, pRI->socket_id);
- return;
-invalid:
- invalidCommandBlock(pRI);
- return;
-}
-
-/**
- * Callee expects const RIL_CarrierRestrictions *
- */
-static void dispatchCarrierRestrictions(Parcel &p, RequestInfo *pRI) {
- RIL_CarrierRestrictions cr;
- RIL_Carrier * allowed_carriers = NULL;
- RIL_Carrier * excluded_carriers = NULL;
- int32_t t;
- status_t status;
-
- memset(&cr, 0, sizeof(RIL_CarrierRestrictions));
-
- if (s_callbacks.version < 14) {
- RLOGE("Unsuppoted RIL version %d, min version expected %d",
- s_callbacks.version, 14);
- RIL_onRequestComplete(pRI, RIL_E_REQUEST_NOT_SUPPORTED, NULL, 0);
- return;
- }
-
- status = p.readInt32(&t);
- if (status != NO_ERROR) {
- goto invalid;
- }
- allowed_carriers = (RIL_Carrier *)calloc(t, sizeof(RIL_Carrier));
- if (allowed_carriers == NULL) {
- RLOGE("Memory allocation failed for request %s", requestToString(pRI->pCI->requestNumber));
- goto exit;
- }
- cr.len_allowed_carriers = t;
- cr.allowed_carriers = allowed_carriers;
-
- status = p.readInt32(&t);
- if (status != NO_ERROR) {
- goto invalid;
- }
- excluded_carriers = (RIL_Carrier *)calloc(t, sizeof(RIL_Carrier));
- if (excluded_carriers == NULL) {
- RLOGE("Memory allocation failed for request %s", requestToString(pRI->pCI->requestNumber));
- goto exit;
- }
- cr.len_excluded_carriers = t;
- cr.excluded_carriers = excluded_carriers;
-
- startRequest;
- appendPrintBuf("%s len_allowed_carriers:%d, len_excluded_carriers:%d,",
- printBuf, cr.len_allowed_carriers, cr.len_excluded_carriers);
-
- appendPrintBuf("%s allowed_carriers:", printBuf);
- for (int32_t i = 0; i < cr.len_allowed_carriers; i++) {
- RIL_Carrier *p_cr = allowed_carriers + i;
- p_cr->mcc = strdupReadString(p);
- p_cr->mnc = strdupReadString(p);
- status = p.readInt32(&t);
- p_cr->match_type = static_cast<RIL_CarrierMatchType>(t);
- if (status != NO_ERROR) {
- goto invalid;
- }
- p_cr->match_data = strdupReadString(p);
- appendPrintBuf("%s [%d mcc:%s, mnc:%s, match_type:%d, match_data:%s],",
- printBuf, i, p_cr->mcc, p_cr->mnc, p_cr->match_type, p_cr->match_data);
- }
-
- for (int32_t i = 0; i < cr.len_excluded_carriers; i++) {
- RIL_Carrier *p_cr = excluded_carriers + i;
- p_cr->mcc = strdupReadString(p);
- p_cr->mnc = strdupReadString(p);
- status = p.readInt32(&t);
- p_cr->match_type = static_cast<RIL_CarrierMatchType>(t);
- if (status != NO_ERROR) {
- goto invalid;
- }
- p_cr->match_data = strdupReadString(p);
- appendPrintBuf("%s [%d mcc:%s, mnc:%s, match_type:%d, match_data:%s],",
- printBuf, i, p_cr->mcc, p_cr->mnc, p_cr->match_type, p_cr->match_data);
- }
-
- closeRequest;
- printRequest(pRI->token, pRI->pCI->requestNumber);
-
- CALL_ONREQUEST(pRI->pCI->requestNumber,
- &cr,
- sizeof(RIL_CarrierRestrictions),
- pRI, pRI->socket_id);
-
- goto exit;
-
-invalid:
- invalidCommandBlock(pRI);
- RIL_onRequestComplete(pRI, RIL_E_INVALID_ARGUMENTS, NULL, 0);
-exit:
- if (allowed_carriers != NULL) {
- free(allowed_carriers);
- }
- if (excluded_carriers != NULL) {
- free(excluded_carriers);
- }
- return;
-}
-
static int
blockingWrite(int fd, const void *buffer, size_t len) {
size_t writeOffset = 0;
@@ -2248,959 +449,6 @@
return 0;
}
-static int
-sendResponse (Parcel &p, RIL_SOCKET_ID socket_id) {
- printResponse;
- return sendResponseRaw(p.data(), p.dataSize(), socket_id);
-}
-
-/** response is an int* pointing to an array of ints */
-
-static int
-responseInts(Parcel &p, int slotId, int requestNumber, int responseType, int token, RIL_Errno e,
- void *response, size_t responselen) {
- int numInts;
-
- if (response == NULL && responselen != 0) {
- RLOGE("invalid response: NULL");
- return RIL_ERRNO_INVALID_RESPONSE;
- }
- if (responselen % sizeof(int) != 0) {
- RLOGE("responseInts: invalid response length %d expected multiple of %d\n",
- (int)responselen, (int)sizeof(int));
- return RIL_ERRNO_INVALID_RESPONSE;
- }
-
- int *p_int = (int *) response;
-
- numInts = responselen / sizeof(int);
- p.writeInt32 (numInts);
-
- /* each int*/
- startResponse;
- for (int i = 0 ; i < numInts ; i++) {
- appendPrintBuf("%s%d,", printBuf, p_int[i]);
- p.writeInt32(p_int[i]);
- }
- removeLastChar;
- closeResponse;
-
- return 0;
-}
-
-// Response is an int or RIL_LastCallFailCauseInfo.
-// Currently, only Shamu plans to use RIL_LastCallFailCauseInfo.
-// TODO(yjl): Let all implementations use RIL_LastCallFailCauseInfo.
-static int responseFailCause(Parcel &p, int slotId, int requestNumber, int responseType, int token,
- RIL_Errno e, void *response, size_t responselen) {
- if (response == NULL && responselen != 0) {
- RLOGE("invalid response: NULL");
- return RIL_ERRNO_INVALID_RESPONSE;
- }
-
- if (responselen == sizeof(int)) {
- startResponse;
- int *p_int = (int *) response;
- appendPrintBuf("%s%d,", printBuf, p_int[0]);
- p.writeInt32(p_int[0]);
- removeLastChar;
- closeResponse;
- } else if (responselen == sizeof(RIL_LastCallFailCauseInfo)) {
- startResponse;
- RIL_LastCallFailCauseInfo *p_fail_cause_info = (RIL_LastCallFailCauseInfo *) response;
- appendPrintBuf("%s[cause_code=%d,vendor_cause=%s]", printBuf, p_fail_cause_info->cause_code,
- p_fail_cause_info->vendor_cause);
- p.writeInt32(p_fail_cause_info->cause_code);
- writeStringToParcel(p, p_fail_cause_info->vendor_cause);
- removeLastChar;
- closeResponse;
- } else {
- RLOGE("responseFailCause: invalid response length %d expected an int or "
- "RIL_LastCallFailCauseInfo", (int)responselen);
- return RIL_ERRNO_INVALID_RESPONSE;
- }
-
- return 0;
-}
-
-/** response is a char **, pointing to an array of char *'s
- The parcel will begin with the version */
-static int responseStringsWithVersion(int version, Parcel &p, int slotId, int requestNumber,
- int responseType, int token, RIL_Errno e, void *response, size_t responselen) {
- p.writeInt32(version);
- return responseStrings(p, slotId, requestNumber, responseType, token, e, response, responselen);
-}
-
-/** response is a char **, pointing to an array of char *'s */
-static int responseStrings(Parcel &p, int slotId, int requestNumber, int responseType, int token,
- RIL_Errno e, void *response, size_t responselen) {
- int numStrings;
-
- if (response == NULL && responselen != 0) {
- RLOGE("invalid response: NULL");
- return RIL_ERRNO_INVALID_RESPONSE;
- }
- if (responselen % sizeof(char *) != 0) {
- RLOGE("responseStrings: invalid response length %d expected multiple of %d\n",
- (int)responselen, (int)sizeof(char *));
- return RIL_ERRNO_INVALID_RESPONSE;
- }
-
- if (response == NULL) {
- p.writeInt32 (0);
- } else {
- char **p_cur = (char **) response;
-
- numStrings = responselen / sizeof(char *);
- p.writeInt32 (numStrings);
-
- /* each string*/
- startResponse;
- for (int i = 0 ; i < numStrings ; i++) {
- appendPrintBuf("%s%s,", printBuf, (char*)p_cur[i]);
- writeStringToParcel (p, p_cur[i]);
- }
- removeLastChar;
- closeResponse;
- }
- return 0;
-}
-
-
-/**
- * NULL strings are accepted
- * FIXME currently ignores responselen
- */
-static int responseString(Parcel &p, int slotId, int requestNumber, int responseType, int token,
- RIL_Errno e, void *response, size_t responselen) {
- /* one string only */
- startResponse;
- appendPrintBuf("%s%s", printBuf, (char*)response);
- closeResponse;
-
- writeStringToParcel(p, (const char *)response);
-
- return 0;
-}
-
-static int responseVoid(Parcel &p, int slotId, int requestNumber, int responseType, int token,
- RIL_Errno e, void *response, size_t responselen) {
- startResponse;
- removeLastChar;
- return 0;
-}
-
-static int responseRaw(Parcel &p, int slotId, int requestNumber, int responseType, int token,
- RIL_Errno e, void *response, size_t responselen) {
- if (response == NULL && responselen != 0) {
- RLOGE("invalid response: NULL with responselen != 0");
- return RIL_ERRNO_INVALID_RESPONSE;
- }
-
- // The java code reads -1 size as null byte array
- if (response == NULL) {
- p.writeInt32(-1);
- } else {
- p.writeInt32(responselen);
- p.write(response, responselen);
- }
-
- return 0;
-}
-
-static int responseSsn(Parcel &p, int slotId, int requestNumber, int responseType, int token,
- RIL_Errno e, void *response, size_t responselen) {
- if (response == NULL) {
- RLOGE("invalid response: NULL");
- return RIL_ERRNO_INVALID_RESPONSE;
- }
-
- if (responselen != sizeof(RIL_SuppSvcNotification)) {
- RLOGE("invalid response length was %d expected %d",
- (int)responselen, (int)sizeof (RIL_SuppSvcNotification));
- return RIL_ERRNO_INVALID_RESPONSE;
- }
-
- RIL_SuppSvcNotification *p_cur = (RIL_SuppSvcNotification *) response;
- p.writeInt32(p_cur->notificationType);
- p.writeInt32(p_cur->code);
- p.writeInt32(p_cur->index);
- p.writeInt32(p_cur->type);
- writeStringToParcel(p, p_cur->number);
-
- startResponse;
- appendPrintBuf("%s%s,code=%d,id=%d,type=%d,%s", printBuf,
- (p_cur->notificationType==0)?"mo":"mt",
- p_cur->code, p_cur->index, p_cur->type,
- (char*)p_cur->number);
- closeResponse;
-
- return 0;
-}
-
-/**
- * Marshall the signalInfoRecord into the parcel if it exists.
- */
-static void marshallSignalInfoRecord(Parcel &p, RIL_CDMA_SignalInfoRecord &p_signalInfoRecord) {
- p.writeInt32(p_signalInfoRecord.isPresent);
- p.writeInt32(p_signalInfoRecord.signalType);
- p.writeInt32(p_signalInfoRecord.alertPitch);
- p.writeInt32(p_signalInfoRecord.signal);
-}
-
-static int responseCdmaInformationRecords(Parcel &p, int slotId, int requestNumber,
- int responseType, int token, RIL_Errno e, void *response, size_t responselen) {
- int num;
- char* string8 = NULL;
- int buffer_lenght;
- RIL_CDMA_InformationRecord *infoRec;
-
- if (response == NULL && responselen != 0) {
- RLOGE("invalid response: NULL");
- return RIL_ERRNO_INVALID_RESPONSE;
- }
-
- if (responselen != sizeof (RIL_CDMA_InformationRecords)) {
- RLOGE("responseCdmaInformationRecords: invalid response length %d expected multiple of \
- %d\n", (int)responselen, (int)sizeof (RIL_CDMA_InformationRecords *));
- return RIL_ERRNO_INVALID_RESPONSE;
- }
-
- RIL_CDMA_InformationRecords *p_cur =
- (RIL_CDMA_InformationRecords *) response;
- num = MIN(p_cur->numberOfInfoRecs, RIL_CDMA_MAX_NUMBER_OF_INFO_RECS);
-
- startResponse;
- p.writeInt32(num);
-
- for (int i = 0 ; i < num ; i++) {
- infoRec = &p_cur->infoRec[i];
- p.writeInt32(infoRec->name);
- switch (infoRec->name) {
- case RIL_CDMA_DISPLAY_INFO_REC:
- case RIL_CDMA_EXTENDED_DISPLAY_INFO_REC:
- if (infoRec->rec.display.alpha_len >
- CDMA_ALPHA_INFO_BUFFER_LENGTH) {
- RLOGE("invalid display info response length %d \
- expected not more than %d\n",
- (int)infoRec->rec.display.alpha_len,
- CDMA_ALPHA_INFO_BUFFER_LENGTH);
- return RIL_ERRNO_INVALID_RESPONSE;
- }
- string8 = (char*) calloc(infoRec->rec.display.alpha_len + 1, sizeof(char));
- if (string8 == NULL) {
- RLOGE("Memory allocation failed for responseCdmaInformationRecords");
- closeRequest;
- return RIL_ERRNO_NO_MEMORY;
- }
- for (int i = 0 ; i < infoRec->rec.display.alpha_len ; i++) {
- string8[i] = infoRec->rec.display.alpha_buf[i];
- }
- string8[(int)infoRec->rec.display.alpha_len] = '\0';
- writeStringToParcel(p, (const char*)string8);
- free(string8);
- string8 = NULL;
- break;
- case RIL_CDMA_CALLED_PARTY_NUMBER_INFO_REC:
- case RIL_CDMA_CALLING_PARTY_NUMBER_INFO_REC:
- case RIL_CDMA_CONNECTED_NUMBER_INFO_REC:
- if (infoRec->rec.number.len > CDMA_NUMBER_INFO_BUFFER_LENGTH) {
- RLOGE("invalid display info response length %d \
- expected not more than %d\n",
- (int)infoRec->rec.number.len,
- CDMA_NUMBER_INFO_BUFFER_LENGTH);
- return RIL_ERRNO_INVALID_RESPONSE;
- }
- string8 = (char*) calloc(infoRec->rec.number.len + 1, sizeof(char));
- if (string8 == NULL) {
- RLOGE("Memory allocation failed for responseCdmaInformationRecords");
- closeRequest;
- return RIL_ERRNO_NO_MEMORY;
- }
- for (int i = 0 ; i < infoRec->rec.number.len; i++) {
- string8[i] = infoRec->rec.number.buf[i];
- }
- string8[(int)infoRec->rec.number.len] = '\0';
- writeStringToParcel(p, (const char*)string8);
- free(string8);
- string8 = NULL;
- p.writeInt32(infoRec->rec.number.number_type);
- p.writeInt32(infoRec->rec.number.number_plan);
- p.writeInt32(infoRec->rec.number.pi);
- p.writeInt32(infoRec->rec.number.si);
- break;
- case RIL_CDMA_SIGNAL_INFO_REC:
- p.writeInt32(infoRec->rec.signal.isPresent);
- p.writeInt32(infoRec->rec.signal.signalType);
- p.writeInt32(infoRec->rec.signal.alertPitch);
- p.writeInt32(infoRec->rec.signal.signal);
-
- appendPrintBuf("%sisPresent=%X, signalType=%X, \
- alertPitch=%X, signal=%X, ",
- printBuf, (int)infoRec->rec.signal.isPresent,
- (int)infoRec->rec.signal.signalType,
- (int)infoRec->rec.signal.alertPitch,
- (int)infoRec->rec.signal.signal);
- removeLastChar;
- break;
- case RIL_CDMA_REDIRECTING_NUMBER_INFO_REC:
- if (infoRec->rec.redir.redirectingNumber.len >
- CDMA_NUMBER_INFO_BUFFER_LENGTH) {
- RLOGE("invalid display info response length %d \
- expected not more than %d\n",
- (int)infoRec->rec.redir.redirectingNumber.len,
- CDMA_NUMBER_INFO_BUFFER_LENGTH);
- return RIL_ERRNO_INVALID_RESPONSE;
- }
- string8 = (char*) calloc(infoRec->rec.redir.redirectingNumber.len + 1,
- sizeof(char));
- if (string8 == NULL) {
- RLOGE("Memory allocation failed for responseCdmaInformationRecords");
- closeRequest;
- return RIL_ERRNO_NO_MEMORY;
- }
- for (int i = 0;
- i < infoRec->rec.redir.redirectingNumber.len;
- i++) {
- string8[i] = infoRec->rec.redir.redirectingNumber.buf[i];
- }
- string8[(int)infoRec->rec.redir.redirectingNumber.len] = '\0';
- writeStringToParcel(p, (const char*)string8);
- free(string8);
- string8 = NULL;
- p.writeInt32(infoRec->rec.redir.redirectingNumber.number_type);
- p.writeInt32(infoRec->rec.redir.redirectingNumber.number_plan);
- p.writeInt32(infoRec->rec.redir.redirectingNumber.pi);
- p.writeInt32(infoRec->rec.redir.redirectingNumber.si);
- p.writeInt32(infoRec->rec.redir.redirectingReason);
- break;
- case RIL_CDMA_LINE_CONTROL_INFO_REC:
- p.writeInt32(infoRec->rec.lineCtrl.lineCtrlPolarityIncluded);
- p.writeInt32(infoRec->rec.lineCtrl.lineCtrlToggle);
- p.writeInt32(infoRec->rec.lineCtrl.lineCtrlReverse);
- p.writeInt32(infoRec->rec.lineCtrl.lineCtrlPowerDenial);
-
- appendPrintBuf("%slineCtrlPolarityIncluded=%d, \
- lineCtrlToggle=%d, lineCtrlReverse=%d, \
- lineCtrlPowerDenial=%d, ", printBuf,
- (int)infoRec->rec.lineCtrl.lineCtrlPolarityIncluded,
- (int)infoRec->rec.lineCtrl.lineCtrlToggle,
- (int)infoRec->rec.lineCtrl.lineCtrlReverse,
- (int)infoRec->rec.lineCtrl.lineCtrlPowerDenial);
- removeLastChar;
- break;
- case RIL_CDMA_T53_CLIR_INFO_REC:
- p.writeInt32((int)(infoRec->rec.clir.cause));
-
- appendPrintBuf("%scause%d", printBuf, infoRec->rec.clir.cause);
- removeLastChar;
- break;
- case RIL_CDMA_T53_AUDIO_CONTROL_INFO_REC:
- p.writeInt32(infoRec->rec.audioCtrl.upLink);
- p.writeInt32(infoRec->rec.audioCtrl.downLink);
-
- appendPrintBuf("%supLink=%d, downLink=%d, ", printBuf,
- infoRec->rec.audioCtrl.upLink,
- infoRec->rec.audioCtrl.downLink);
- removeLastChar;
- break;
- case RIL_CDMA_T53_RELEASE_INFO_REC:
- // TODO(Moto): See David Krause, he has the answer:)
- RLOGE("RIL_CDMA_T53_RELEASE_INFO_REC: return INVALID_RESPONSE");
- return RIL_ERRNO_INVALID_RESPONSE;
- default:
- RLOGE("Incorrect name value");
- return RIL_ERRNO_INVALID_RESPONSE;
- }
- }
- closeResponse;
-
- return 0;
-}
-
-static void responseRilSignalStrengthV5(Parcel &p, int slotId, int requestNumber, int responseType,
- int token, RIL_Errno e, RIL_SignalStrength_v10 *p_cur) {
- p.writeInt32(p_cur->GW_SignalStrength.signalStrength);
- p.writeInt32(p_cur->GW_SignalStrength.bitErrorRate);
- p.writeInt32(p_cur->CDMA_SignalStrength.dbm);
- p.writeInt32(p_cur->CDMA_SignalStrength.ecio);
- p.writeInt32(p_cur->EVDO_SignalStrength.dbm);
- p.writeInt32(p_cur->EVDO_SignalStrength.ecio);
- p.writeInt32(p_cur->EVDO_SignalStrength.signalNoiseRatio);
-}
-
-static void responseRilSignalStrengthV6Extra(Parcel &p, int slotId, int requestNumber,
- int responseType, int token, RIL_Errno e, RIL_SignalStrength_v10 *p_cur) {
- /*
- * Fixup LTE for backwards compatibility
- */
- // signalStrength: -1 -> 99
- if (p_cur->LTE_SignalStrength.signalStrength == -1) {
- p_cur->LTE_SignalStrength.signalStrength = 99;
- }
- // rsrp: -1 -> INT_MAX all other negative value to positive.
- // So remap here
- if (p_cur->LTE_SignalStrength.rsrp == -1) {
- p_cur->LTE_SignalStrength.rsrp = INT_MAX;
- } else if (p_cur->LTE_SignalStrength.rsrp < -1) {
- p_cur->LTE_SignalStrength.rsrp = -p_cur->LTE_SignalStrength.rsrp;
- }
- // rsrq: -1 -> INT_MAX
- if (p_cur->LTE_SignalStrength.rsrq == -1) {
- p_cur->LTE_SignalStrength.rsrq = INT_MAX;
- }
- // Not remapping rssnr is already using INT_MAX
-
- // cqi: -1 -> INT_MAX
- if (p_cur->LTE_SignalStrength.cqi == -1) {
- p_cur->LTE_SignalStrength.cqi = INT_MAX;
- }
-
- p.writeInt32(p_cur->LTE_SignalStrength.signalStrength);
- p.writeInt32(p_cur->LTE_SignalStrength.rsrp);
- p.writeInt32(p_cur->LTE_SignalStrength.rsrq);
- p.writeInt32(p_cur->LTE_SignalStrength.rssnr);
- p.writeInt32(p_cur->LTE_SignalStrength.cqi);
-}
-
-static void responseRilSignalStrengthV10(Parcel &p, int slotId, int requestNumber, int responseType,
- int token, RIL_Errno e, RIL_SignalStrength_v10 *p_cur) {
- responseRilSignalStrengthV5(p, slotId, requestNumber, responseType, token, e, p_cur);
- responseRilSignalStrengthV6Extra(p, slotId, requestNumber, responseType, token, e, p_cur);
- p.writeInt32(p_cur->TD_SCDMA_SignalStrength.rscp);
-}
-
-static int responseRilSignalStrength(Parcel &p, int slotId, int requestNumber, int responseType,
- int token, RIL_Errno e, void *response, size_t responselen) {
- if (response == NULL && responselen != 0) {
- RLOGE("invalid response: NULL");
- return RIL_ERRNO_INVALID_RESPONSE;
- }
-
- RIL_SignalStrength_v10 *p_cur;
- if (s_callbacks.version <= LAST_IMPRECISE_RIL_VERSION) {
- if (responselen >= sizeof (RIL_SignalStrength_v5)) {
- p_cur = ((RIL_SignalStrength_v10 *) response);
-
- responseRilSignalStrengthV5(p, slotId, requestNumber, responseType, token, e, p_cur);
-
- if (responselen >= sizeof (RIL_SignalStrength_v6)) {
- responseRilSignalStrengthV6Extra(p, slotId, requestNumber, responseType, token, e,
- p_cur);
- if (responselen >= sizeof (RIL_SignalStrength_v10)) {
- p.writeInt32(p_cur->TD_SCDMA_SignalStrength.rscp);
- } else {
- p.writeInt32(INT_MAX);
- }
- } else {
- p.writeInt32(99);
- p.writeInt32(INT_MAX);
- p.writeInt32(INT_MAX);
- p.writeInt32(INT_MAX);
- p.writeInt32(INT_MAX);
- p.writeInt32(INT_MAX);
- }
- } else {
- RLOGE("invalid response length");
- return RIL_ERRNO_INVALID_RESPONSE;
- }
- } else { // RIL version >= 13
- if (responselen % sizeof(RIL_SignalStrength_v10) != 0) {
- RLOGE("Data structure expected is RIL_SignalStrength_v10");
- if (!isDebuggable()) {
- return RIL_ERRNO_INVALID_RESPONSE;
- } else {
- assert(0);
- }
- }
- p_cur = ((RIL_SignalStrength_v10 *) response);
- responseRilSignalStrengthV10(p, slotId, requestNumber, responseType, token, e, p_cur);
- }
- startResponse;
- appendPrintBuf("%s[signalStrength=%d,bitErrorRate=%d,\
- CDMA_SS.dbm=%d,CDMA_SSecio=%d,\
- EVDO_SS.dbm=%d,EVDO_SS.ecio=%d,\
- EVDO_SS.signalNoiseRatio=%d,\
- LTE_SS.signalStrength=%d,LTE_SS.rsrp=%d,LTE_SS.rsrq=%d,\
- LTE_SS.rssnr=%d,LTE_SS.cqi=%d,TDSCDMA_SS.rscp=%d]",
- printBuf,
- p_cur->GW_SignalStrength.signalStrength,
- p_cur->GW_SignalStrength.bitErrorRate,
- p_cur->CDMA_SignalStrength.dbm,
- p_cur->CDMA_SignalStrength.ecio,
- p_cur->EVDO_SignalStrength.dbm,
- p_cur->EVDO_SignalStrength.ecio,
- p_cur->EVDO_SignalStrength.signalNoiseRatio,
- p_cur->LTE_SignalStrength.signalStrength,
- p_cur->LTE_SignalStrength.rsrp,
- p_cur->LTE_SignalStrength.rsrq,
- p_cur->LTE_SignalStrength.rssnr,
- p_cur->LTE_SignalStrength.cqi,
- p_cur->TD_SCDMA_SignalStrength.rscp);
- closeResponse;
- return 0;
-}
-
-static int responseCallRing(Parcel &p, int slotId, int requestNumber, int responseType, int token,
- RIL_Errno e, void *response, size_t responselen) {
- if ((response == NULL) || (responselen == 0)) {
- return responseVoid(p, slotId, requestNumber, responseType, token, e, response,
- responselen);
- } else {
- return responseCdmaSignalInfoRecord(p, slotId, requestNumber, responseType, token, e,
- response, responselen);
- }
-}
-
-static int responseCdmaSignalInfoRecord(Parcel &p, int slotId, int requestNumber, int responseType,
- int token, RIL_Errno e, void *response, size_t responselen) {
- if (response == NULL || responselen == 0) {
- RLOGE("invalid response: NULL");
- return RIL_ERRNO_INVALID_RESPONSE;
- }
-
- if (responselen != sizeof (RIL_CDMA_SignalInfoRecord)) {
- RLOGE("invalid response length %d expected sizeof (RIL_CDMA_SignalInfoRecord) of %d\n",
- (int)responselen, (int)sizeof (RIL_CDMA_SignalInfoRecord));
- return RIL_ERRNO_INVALID_RESPONSE;
- }
-
- startResponse;
-
- RIL_CDMA_SignalInfoRecord *p_cur = ((RIL_CDMA_SignalInfoRecord *) response);
- marshallSignalInfoRecord(p, *p_cur);
-
- appendPrintBuf("%s[isPresent=%d,signalType=%d,alertPitch=%d\
- signal=%d]",
- printBuf,
- p_cur->isPresent,
- p_cur->signalType,
- p_cur->alertPitch,
- p_cur->signal);
-
- closeResponse;
- return 0;
-}
-
-static int responseCdmaCallWaiting(Parcel &p, int slotId, int requestNumber, int responseType,
- int token, RIL_Errno e, void *response, size_t responselen) {
- if (response == NULL && responselen != 0) {
- RLOGE("invalid response: NULL");
- return RIL_ERRNO_INVALID_RESPONSE;
- }
-
- if (responselen < sizeof(RIL_CDMA_CallWaiting_v6)) {
- RLOGW("Upgrade to ril version %d\n", RIL_VERSION);
- }
-
- RIL_CDMA_CallWaiting_v6 *p_cur = ((RIL_CDMA_CallWaiting_v6 *) response);
-
- writeStringToParcel(p, p_cur->number);
- p.writeInt32(p_cur->numberPresentation);
- writeStringToParcel(p, p_cur->name);
- marshallSignalInfoRecord(p, p_cur->signalInfoRecord);
-
- if (s_callbacks.version <= LAST_IMPRECISE_RIL_VERSION) {
- if (responselen >= sizeof(RIL_CDMA_CallWaiting_v6)) {
- p.writeInt32(p_cur->number_type);
- p.writeInt32(p_cur->number_plan);
- } else {
- p.writeInt32(0);
- p.writeInt32(0);
- }
- } else { // RIL version >= 13
- if (responselen % sizeof(RIL_CDMA_CallWaiting_v6) != 0) {
- RLOGE("Data structure expected is RIL_CDMA_CallWaiting_v6");
- if (!isDebuggable()) {
- return RIL_ERRNO_INVALID_RESPONSE;
- } else {
- assert(0);
- }
- }
- p.writeInt32(p_cur->number_type);
- p.writeInt32(p_cur->number_plan);
- }
-
- startResponse;
- appendPrintBuf("%snumber=%s,numberPresentation=%d, name=%s,\
- signalInfoRecord[isPresent=%d,signalType=%d,alertPitch=%d\
- signal=%d,number_type=%d,number_plan=%d]",
- printBuf,
- p_cur->number,
- p_cur->numberPresentation,
- p_cur->name,
- p_cur->signalInfoRecord.isPresent,
- p_cur->signalInfoRecord.signalType,
- p_cur->signalInfoRecord.alertPitch,
- p_cur->signalInfoRecord.signal,
- p_cur->number_type,
- p_cur->number_plan);
- closeResponse;
-
- return 0;
-}
-
-static void responseSimRefreshV7(Parcel &p, int slotId, int requestNumber, int responseType,
- int token, RIL_Errno e, void *response) {
- RIL_SimRefreshResponse_v7 *p_cur = ((RIL_SimRefreshResponse_v7 *) response);
- p.writeInt32(p_cur->result);
- p.writeInt32(p_cur->ef_id);
- writeStringToParcel(p, p_cur->aid);
-
- appendPrintBuf("%sresult=%d, ef_id=%d, aid=%s",
- printBuf,
- p_cur->result,
- p_cur->ef_id,
- p_cur->aid);
-
-}
-
-static int responseSimRefresh(Parcel &p, int slotId, int requestNumber, int responseType, int token,
- RIL_Errno e, void *response, size_t responselen) {
- if (response == NULL && responselen != 0) {
- RLOGE("responseSimRefresh: invalid response: NULL");
- return RIL_ERRNO_INVALID_RESPONSE;
- }
-
- startResponse;
- if (s_callbacks.version <= LAST_IMPRECISE_RIL_VERSION) {
- if (s_callbacks.version >= 7) {
- responseSimRefreshV7(p, slotId, requestNumber, responseType, token, e, response);
- } else {
- int *p_cur = ((int *) response);
- p.writeInt32(p_cur[0]);
- p.writeInt32(p_cur[1]);
- writeStringToParcel(p, NULL);
-
- appendPrintBuf("%sresult=%d, ef_id=%d",
- printBuf,
- p_cur[0],
- p_cur[1]);
- }
- } else { // RIL version >= 13
- if (responselen % sizeof(RIL_SimRefreshResponse_v7) != 0) {
- RLOGE("Data structure expected is RIL_SimRefreshResponse_v7");
- if (!isDebuggable()) {
- return RIL_ERRNO_INVALID_RESPONSE;
- } else {
- assert(0);
- }
- }
- responseSimRefreshV7(p, slotId, requestNumber, responseType, token, e, response);
-
- }
- closeResponse;
-
- return 0;
-}
-
-static int responseCellInfoListV6(Parcel &p, int slotId, int requestNumber, int responseType,
- int token, RIL_Errno e, void *response, size_t responselen) {
- if (response == NULL && responselen != 0) {
- RLOGE("invalid response: NULL");
- return RIL_ERRNO_INVALID_RESPONSE;
- }
-
- if (responselen % sizeof(RIL_CellInfo) != 0) {
- RLOGE("responseCellInfoList: invalid response length %d expected multiple of %d",
- (int)responselen, (int)sizeof(RIL_CellInfo));
- return RIL_ERRNO_INVALID_RESPONSE;
- }
-
- int num = responselen / sizeof(RIL_CellInfo);
- p.writeInt32(num);
-
- RIL_CellInfo *p_cur = (RIL_CellInfo *) response;
- startResponse;
- int i;
- for (i = 0; i < num; i++) {
- p.writeInt32((int)p_cur->cellInfoType);
- p.writeInt32(p_cur->registered);
- p.writeInt32(p_cur->timeStampType);
- p.writeInt64(p_cur->timeStamp);
- switch(p_cur->cellInfoType) {
- case RIL_CELL_INFO_TYPE_GSM: {
- p.writeInt32(p_cur->CellInfo.gsm.cellIdentityGsm.mcc);
- p.writeInt32(p_cur->CellInfo.gsm.cellIdentityGsm.mnc);
- p.writeInt32(p_cur->CellInfo.gsm.cellIdentityGsm.lac);
- p.writeInt32(p_cur->CellInfo.gsm.cellIdentityGsm.cid);
- p.writeInt32(p_cur->CellInfo.gsm.signalStrengthGsm.signalStrength);
- p.writeInt32(p_cur->CellInfo.gsm.signalStrengthGsm.bitErrorRate);
- break;
- }
- case RIL_CELL_INFO_TYPE_WCDMA: {
- p.writeInt32(p_cur->CellInfo.wcdma.cellIdentityWcdma.mcc);
- p.writeInt32(p_cur->CellInfo.wcdma.cellIdentityWcdma.mnc);
- p.writeInt32(p_cur->CellInfo.wcdma.cellIdentityWcdma.lac);
- p.writeInt32(p_cur->CellInfo.wcdma.cellIdentityWcdma.cid);
- p.writeInt32(p_cur->CellInfo.wcdma.cellIdentityWcdma.psc);
- p.writeInt32(p_cur->CellInfo.wcdma.signalStrengthWcdma.signalStrength);
- p.writeInt32(p_cur->CellInfo.wcdma.signalStrengthWcdma.bitErrorRate);
- break;
- }
- case RIL_CELL_INFO_TYPE_CDMA: {
- p.writeInt32(p_cur->CellInfo.cdma.cellIdentityCdma.networkId);
- p.writeInt32(p_cur->CellInfo.cdma.cellIdentityCdma.systemId);
- p.writeInt32(p_cur->CellInfo.cdma.cellIdentityCdma.basestationId);
- p.writeInt32(p_cur->CellInfo.cdma.cellIdentityCdma.longitude);
- p.writeInt32(p_cur->CellInfo.cdma.cellIdentityCdma.latitude);
-
- p.writeInt32(p_cur->CellInfo.cdma.signalStrengthCdma.dbm);
- p.writeInt32(p_cur->CellInfo.cdma.signalStrengthCdma.ecio);
- p.writeInt32(p_cur->CellInfo.cdma.signalStrengthEvdo.dbm);
- p.writeInt32(p_cur->CellInfo.cdma.signalStrengthEvdo.ecio);
- p.writeInt32(p_cur->CellInfo.cdma.signalStrengthEvdo.signalNoiseRatio);
- break;
- }
- case RIL_CELL_INFO_TYPE_LTE: {
- p.writeInt32(p_cur->CellInfo.lte.cellIdentityLte.mcc);
- p.writeInt32(p_cur->CellInfo.lte.cellIdentityLte.mnc);
- p.writeInt32(p_cur->CellInfo.lte.cellIdentityLte.ci);
- p.writeInt32(p_cur->CellInfo.lte.cellIdentityLte.pci);
- p.writeInt32(p_cur->CellInfo.lte.cellIdentityLte.tac);
-
- p.writeInt32(p_cur->CellInfo.lte.signalStrengthLte.signalStrength);
- p.writeInt32(p_cur->CellInfo.lte.signalStrengthLte.rsrp);
- p.writeInt32(p_cur->CellInfo.lte.signalStrengthLte.rsrq);
- p.writeInt32(p_cur->CellInfo.lte.signalStrengthLte.rssnr);
- p.writeInt32(p_cur->CellInfo.lte.signalStrengthLte.cqi);
- p.writeInt32(p_cur->CellInfo.lte.signalStrengthLte.timingAdvance);
- break;
- }
- case RIL_CELL_INFO_TYPE_TD_SCDMA: {
- p.writeInt32(p_cur->CellInfo.tdscdma.cellIdentityTdscdma.mcc);
- p.writeInt32(p_cur->CellInfo.tdscdma.cellIdentityTdscdma.mnc);
- p.writeInt32(p_cur->CellInfo.tdscdma.cellIdentityTdscdma.lac);
- p.writeInt32(p_cur->CellInfo.tdscdma.cellIdentityTdscdma.cid);
- p.writeInt32(p_cur->CellInfo.tdscdma.cellIdentityTdscdma.cpid);
- p.writeInt32(p_cur->CellInfo.tdscdma.signalStrengthTdscdma.rscp);
- break;
- }
- default: {
- break;
- }
- }
- p_cur += 1;
- }
- removeLastChar;
- closeResponse;
-
- return 0;
-}
-
-static int responseCellInfoListV12(Parcel &p, int slotId, int requestNumber, int responseType,
- int token, RIL_Errno e, void *response, size_t responselen) {
- if (response == NULL && responselen != 0) {
- RLOGE("invalid response: NULL");
- return RIL_ERRNO_INVALID_RESPONSE;
- }
-
- if (responselen % sizeof(RIL_CellInfo_v12) != 0) {
- RLOGE("responseCellInfoList: invalid response length %d expected multiple of %d",
- (int)responselen, (int)sizeof(RIL_CellInfo_v12));
- return RIL_ERRNO_INVALID_RESPONSE;
- }
-
- int num = responselen / sizeof(RIL_CellInfo_v12);
- p.writeInt32(num);
-
- RIL_CellInfo_v12 *p_cur = (RIL_CellInfo_v12 *) response;
- startResponse;
- int i;
- for (i = 0; i < num; i++) {
- p.writeInt32((int)p_cur->cellInfoType);
- p.writeInt32(p_cur->registered);
- p.writeInt32(p_cur->timeStampType);
- p.writeInt64(p_cur->timeStamp);
- switch(p_cur->cellInfoType) {
- case RIL_CELL_INFO_TYPE_GSM: {
- p.writeInt32(p_cur->CellInfo.gsm.cellIdentityGsm.mcc);
- p.writeInt32(p_cur->CellInfo.gsm.cellIdentityGsm.mnc);
- p.writeInt32(p_cur->CellInfo.gsm.cellIdentityGsm.lac);
- p.writeInt32(p_cur->CellInfo.gsm.cellIdentityGsm.cid);
- p.writeInt32(p_cur->CellInfo.gsm.cellIdentityGsm.arfcn);
- p.writeInt32(p_cur->CellInfo.gsm.cellIdentityGsm.bsic);
- p.writeInt32(p_cur->CellInfo.gsm.signalStrengthGsm.signalStrength);
- p.writeInt32(p_cur->CellInfo.gsm.signalStrengthGsm.bitErrorRate);
- p.writeInt32(p_cur->CellInfo.gsm.signalStrengthGsm.timingAdvance);
- break;
- }
- case RIL_CELL_INFO_TYPE_WCDMA: {
- p.writeInt32(p_cur->CellInfo.wcdma.cellIdentityWcdma.mcc);
- p.writeInt32(p_cur->CellInfo.wcdma.cellIdentityWcdma.mnc);
- p.writeInt32(p_cur->CellInfo.wcdma.cellIdentityWcdma.lac);
- p.writeInt32(p_cur->CellInfo.wcdma.cellIdentityWcdma.cid);
- p.writeInt32(p_cur->CellInfo.wcdma.cellIdentityWcdma.psc);
- p.writeInt32(p_cur->CellInfo.wcdma.cellIdentityWcdma.uarfcn);
- p.writeInt32(p_cur->CellInfo.wcdma.signalStrengthWcdma.signalStrength);
- p.writeInt32(p_cur->CellInfo.wcdma.signalStrengthWcdma.bitErrorRate);
- break;
- }
- case RIL_CELL_INFO_TYPE_CDMA: {
- p.writeInt32(p_cur->CellInfo.cdma.cellIdentityCdma.networkId);
- p.writeInt32(p_cur->CellInfo.cdma.cellIdentityCdma.systemId);
- p.writeInt32(p_cur->CellInfo.cdma.cellIdentityCdma.basestationId);
- p.writeInt32(p_cur->CellInfo.cdma.cellIdentityCdma.longitude);
- p.writeInt32(p_cur->CellInfo.cdma.cellIdentityCdma.latitude);
-
- p.writeInt32(p_cur->CellInfo.cdma.signalStrengthCdma.dbm);
- p.writeInt32(p_cur->CellInfo.cdma.signalStrengthCdma.ecio);
- p.writeInt32(p_cur->CellInfo.cdma.signalStrengthEvdo.dbm);
- p.writeInt32(p_cur->CellInfo.cdma.signalStrengthEvdo.ecio);
- p.writeInt32(p_cur->CellInfo.cdma.signalStrengthEvdo.signalNoiseRatio);
- break;
- }
- case RIL_CELL_INFO_TYPE_LTE: {
- p.writeInt32(p_cur->CellInfo.lte.cellIdentityLte.mcc);
- p.writeInt32(p_cur->CellInfo.lte.cellIdentityLte.mnc);
- p.writeInt32(p_cur->CellInfo.lte.cellIdentityLte.ci);
- p.writeInt32(p_cur->CellInfo.lte.cellIdentityLte.pci);
- p.writeInt32(p_cur->CellInfo.lte.cellIdentityLte.tac);
- p.writeInt32(p_cur->CellInfo.lte.cellIdentityLte.earfcn);
-
- p.writeInt32(p_cur->CellInfo.lte.signalStrengthLte.signalStrength);
- p.writeInt32(p_cur->CellInfo.lte.signalStrengthLte.rsrp);
- p.writeInt32(p_cur->CellInfo.lte.signalStrengthLte.rsrq);
- p.writeInt32(p_cur->CellInfo.lte.signalStrengthLte.rssnr);
- p.writeInt32(p_cur->CellInfo.lte.signalStrengthLte.cqi);
- p.writeInt32(p_cur->CellInfo.lte.signalStrengthLte.timingAdvance);
- break;
- }
- case RIL_CELL_INFO_TYPE_TD_SCDMA: {
- p.writeInt32(p_cur->CellInfo.tdscdma.cellIdentityTdscdma.mcc);
- p.writeInt32(p_cur->CellInfo.tdscdma.cellIdentityTdscdma.mnc);
- p.writeInt32(p_cur->CellInfo.tdscdma.cellIdentityTdscdma.lac);
- p.writeInt32(p_cur->CellInfo.tdscdma.cellIdentityTdscdma.cid);
- p.writeInt32(p_cur->CellInfo.tdscdma.cellIdentityTdscdma.cpid);
- p.writeInt32(p_cur->CellInfo.tdscdma.signalStrengthTdscdma.rscp);
- break;
- }
- default: {
- break;
- }
- }
- p_cur += 1;
- }
- removeLastChar;
- closeResponse;
- return 0;
-}
-
-static int responseCellInfoList(Parcel &p, int slotId, int requestNumber, int responseType,
- int token, RIL_Errno e, void *response, size_t responselen) {
- if (s_callbacks.version <= LAST_IMPRECISE_RIL_VERSION) {
- if (s_callbacks.version < 12) {
- RLOGD("responseCellInfoList: v6");
- return responseCellInfoListV6(p, slotId, requestNumber, responseType, token, e,
- response, responselen);
- } else {
- RLOGD("responseCellInfoList: v12");
- return responseCellInfoListV12(p, slotId, requestNumber, responseType, token, e,
- response, responselen);
- }
- } else { // RIL version >= 13
- if (responselen % sizeof(RIL_CellInfo_v12) != 0) {
- RLOGE("Data structure expected is RIL_CellInfo_v12");
- if (!isDebuggable()) {
- return RIL_ERRNO_INVALID_RESPONSE;
- } else {
- assert(0);
- }
- }
- return responseCellInfoListV12(p, slotId, requestNumber, responseType, token, e, response,
- responselen);
- }
-
- return 0;
-}
-
-static int responseHardwareConfig(Parcel &p, int slotId, int requestNumber, int responseType,
- int token, RIL_Errno e, void *response, size_t responselen) {
- if (response == NULL && responselen != 0) {
- RLOGE("invalid response: NULL");
- return RIL_ERRNO_INVALID_RESPONSE;
- }
-
- if (responselen % sizeof(RIL_HardwareConfig) != 0) {
- RLOGE("responseHardwareConfig: invalid response length %d expected multiple of %d",
- (int)responselen, (int)sizeof(RIL_HardwareConfig));
- return RIL_ERRNO_INVALID_RESPONSE;
- }
-
- int num = responselen / sizeof(RIL_HardwareConfig);
- int i;
- RIL_HardwareConfig *p_cur = (RIL_HardwareConfig *) response;
-
- p.writeInt32(num);
-
- startResponse;
- for (i = 0; i < num; i++) {
- switch (p_cur[i].type) {
- case RIL_HARDWARE_CONFIG_MODEM: {
- writeStringToParcel(p, p_cur[i].uuid);
- p.writeInt32((int)p_cur[i].state);
- p.writeInt32(p_cur[i].cfg.modem.rat);
- p.writeInt32(p_cur[i].cfg.modem.maxVoice);
- p.writeInt32(p_cur[i].cfg.modem.maxData);
- p.writeInt32(p_cur[i].cfg.modem.maxStandby);
-
- appendPrintBuf("%s modem: uuid=%s,state=%d,rat=%08x,maxV=%d,maxD=%d,maxS=%d", printBuf,
- p_cur[i].uuid, (int)p_cur[i].state, p_cur[i].cfg.modem.rat,
- p_cur[i].cfg.modem.maxVoice, p_cur[i].cfg.modem.maxData,
- p_cur[i].cfg.modem.maxStandby);
- break;
- }
- case RIL_HARDWARE_CONFIG_SIM: {
- writeStringToParcel(p, p_cur[i].uuid);
- p.writeInt32((int)p_cur[i].state);
- writeStringToParcel(p, p_cur[i].cfg.sim.modemUuid);
-
- appendPrintBuf("%s sim: uuid=%s,state=%d,modem-uuid=%s", printBuf,
- p_cur[i].uuid, (int)p_cur[i].state, p_cur[i].cfg.sim.modemUuid);
- break;
- }
- }
- }
- removeLastChar;
- closeResponse;
- return 0;
-}
-
-static int responseRadioCapability(Parcel &p, int slotId, int requestNumber, int responseType,
- int token, RIL_Errno e, void *response, size_t responselen) {
- if (response == NULL) {
- RLOGE("invalid response: NULL");
- return RIL_ERRNO_INVALID_RESPONSE;
- }
-
- if (responselen != sizeof (RIL_RadioCapability) ) {
- RLOGE("invalid response length was %d expected %d",
- (int)responselen, (int)sizeof (RIL_SIM_IO_Response));
- return RIL_ERRNO_INVALID_RESPONSE;
- }
-
- RIL_RadioCapability *p_cur = (RIL_RadioCapability *) response;
- p.writeInt32(p_cur->version);
- p.writeInt32(p_cur->session);
- p.writeInt32(p_cur->phase);
- p.writeInt32(p_cur->rat);
- writeStringToParcel(p, p_cur->logicalModemUuid);
- p.writeInt32(p_cur->status);
-
- startResponse;
- appendPrintBuf("%s[version=%d,session=%d,phase=%d,\
- rat=%s,logicalModemUuid=%s,status=%d]",
- printBuf,
- p_cur->version,
- p_cur->session,
- p_cur->phase,
- p_cur->rat,
- p_cur->logicalModemUuid,
- p_cur->status);
- closeResponse;
- return 0;
-}
-
static void triggerEvLoop() {
int ret;
if (!pthread_equal(pthread_self(), s_tid_dispatch)) {
@@ -3217,144 +465,6 @@
triggerEvLoop();
}
-static int responseCdmaSms(Parcel &p, int slotId, int requestNumber, int responseType, int token,
- RIL_Errno e, void *response, size_t responselen) {
- int num;
- int digitCount;
- int digitLimit;
- uint8_t uct;
- void* dest;
-
- RLOGD("Inside responseCdmaSms");
-
- if (response == NULL && responselen != 0) {
- RLOGE("invalid response: NULL");
- return RIL_ERRNO_INVALID_RESPONSE;
- }
-
- if (responselen != sizeof(RIL_CDMA_SMS_Message)) {
- RLOGE("invalid response length was %d expected %d",
- (int)responselen, (int)sizeof(RIL_CDMA_SMS_Message));
- return RIL_ERRNO_INVALID_RESPONSE;
- }
-
- RIL_CDMA_SMS_Message *p_cur = (RIL_CDMA_SMS_Message *) response;
- p.writeInt32(p_cur->uTeleserviceID);
- p.write(&(p_cur->bIsServicePresent),sizeof(uct));
- p.writeInt32(p_cur->uServicecategory);
- p.writeInt32(p_cur->sAddress.digit_mode);
- p.writeInt32(p_cur->sAddress.number_mode);
- p.writeInt32(p_cur->sAddress.number_type);
- p.writeInt32(p_cur->sAddress.number_plan);
- p.write(&(p_cur->sAddress.number_of_digits), sizeof(uct));
- digitLimit= MIN((p_cur->sAddress.number_of_digits), RIL_CDMA_SMS_ADDRESS_MAX);
- for(digitCount =0 ; digitCount < digitLimit; digitCount ++) {
- p.write(&(p_cur->sAddress.digits[digitCount]),sizeof(uct));
- }
-
- p.writeInt32(p_cur->sSubAddress.subaddressType);
- p.write(&(p_cur->sSubAddress.odd),sizeof(uct));
- p.write(&(p_cur->sSubAddress.number_of_digits),sizeof(uct));
- digitLimit= MIN((p_cur->sSubAddress.number_of_digits), RIL_CDMA_SMS_SUBADDRESS_MAX);
- for(digitCount =0 ; digitCount < digitLimit; digitCount ++) {
- p.write(&(p_cur->sSubAddress.digits[digitCount]),sizeof(uct));
- }
-
- digitLimit= MIN((p_cur->uBearerDataLen), RIL_CDMA_SMS_BEARER_DATA_MAX);
- p.writeInt32(p_cur->uBearerDataLen);
- for(digitCount =0 ; digitCount < digitLimit; digitCount ++) {
- p.write(&(p_cur->aBearerData[digitCount]), sizeof(uct));
- }
-
- startResponse;
- appendPrintBuf("%suTeleserviceID=%d, bIsServicePresent=%d, uServicecategory=%d, \
- sAddress.digit_mode=%d, sAddress.number_mode=%d, sAddress.number_type=%d, ",
- printBuf, p_cur->uTeleserviceID,p_cur->bIsServicePresent,p_cur->uServicecategory,
- p_cur->sAddress.digit_mode, p_cur->sAddress.number_mode,p_cur->sAddress.number_type);
- closeResponse;
-
- return 0;
-}
-
-static int responseDcRtInfo(Parcel &p, int slotId, int requestNumber, int responseType, int token,
- RIL_Errno e, void *response, size_t responselen)
-{
- int num = responselen / sizeof(RIL_DcRtInfo);
- if ((responselen % sizeof(RIL_DcRtInfo) != 0) || (num != 1)) {
- RLOGE("responseDcRtInfo: invalid response length %d expected multiple of %d",
- (int)responselen, (int)sizeof(RIL_DcRtInfo));
- return RIL_ERRNO_INVALID_RESPONSE;
- }
-
- startResponse;
- RIL_DcRtInfo *pDcRtInfo = (RIL_DcRtInfo *)response;
- p.writeInt64(pDcRtInfo->time);
- p.writeInt32(pDcRtInfo->powerState);
- appendPrintBuf("%s[time=%d,powerState=%d]", printBuf,
- pDcRtInfo->time,
- pDcRtInfo->powerState);
- closeResponse;
-
- return 0;
-}
-
-static int responseLceData(Parcel &p, int slotId, int requestNumber, int responseType, int token,
- RIL_Errno e, void *response, size_t responselen) {
- if (response == NULL || responselen != sizeof(RIL_LceDataInfo)) {
- if (response == NULL) {
- RLOGE("invalid response: NULL");
- }
- else {
- RLOGE("responseLceData: invalid response length %u expecting len: %u",
- (unsigned)sizeof(RIL_LceDataInfo), (unsigned)responselen);
- }
- return RIL_ERRNO_INVALID_RESPONSE;
- }
-
- RIL_LceDataInfo *p_cur = (RIL_LceDataInfo *)response;
- p.writeInt32(p_cur->last_hop_capacity_kbps);
-
- /* p_cur->confidence_level and p_cur->lce_suspended take 1 byte each.*/
- p.write((void *)&(p_cur->confidence_level), 1);
- p.write((void *)&(p_cur->lce_suspended), 1);
-
- startResponse;
- appendPrintBuf("LCE info received: capacity %d confidence level %d \
- and suspended %d",
- p_cur->last_hop_capacity_kbps, p_cur->confidence_level,
- p_cur->lce_suspended);
- closeResponse;
-
- return 0;
-}
-
-static int responsePcoData(Parcel &p, int slotId, int requestNumber, int responseType, int token,
- RIL_Errno e, void *response, size_t responselen) {
- if (response == NULL) {
- RLOGE("responsePcoData: invalid NULL response");
- return RIL_ERRNO_INVALID_RESPONSE;
- }
- if (responselen != sizeof(RIL_PCO_Data)) {
- RLOGE("responsePcoData: invalid response length %u, expecting %u",
- (unsigned)responselen, (unsigned)sizeof(RIL_PCO_Data));
- return RIL_ERRNO_INVALID_RESPONSE;
- }
-
- RIL_PCO_Data *p_cur = (RIL_PCO_Data *)response;
- p.writeInt32(p_cur->cid);
- writeStringToParcel(p, p_cur->bearer_proto);
- p.writeInt32(p_cur->pco_id);
- p.writeInt32(p_cur->contents_length);
- p.write(p_cur->contents, p_cur->contents_length);
-
- startResponse;
- appendPrintBuf("PCO data received: cid %d, id %d, length %d",
- p_cur->cid, p_cur->pco_id, p_cur->contents_length);
- closeResponse;
-
- return 0;
-}
-
/**
* A write on the wakeup fd is done just to pop us out of select()
* We empty the buffer here and then ril_event will reset the timers on the
@@ -3465,12 +575,11 @@
static void resendLastNITZTimeData(RIL_SOCKET_ID socket_id) {
if (s_lastNITZTimeData != NULL) {
- Parcel p;
int responseType = (s_callbacks.version >= 13)
? RESPONSE_UNSOLICITED_ACK_EXP
: RESPONSE_UNSOLICITED;
int ret = radio::nitzTimeReceivedInd(
- p, (int)socket_id, RIL_UNSOL_NITZ_TIME_RECEIVED, responseType, 0,
+ (int)socket_id, responseType, 0,
RIL_E_SUCCESS, s_lastNITZTimeData, s_lastNITZTimeDataSize);
if (ret == 0) {
free(s_lastNITZTimeData);
@@ -4345,7 +1454,7 @@
int rwlockRet = pthread_rwlock_rdlock(radioServiceRwlockPtr);
assert(rwlockRet == 0);
- ret = pRI->pCI->responseFunction(p, (int) socket_id, pRI->pCI->requestNumber,
+ ret = pRI->pCI->responseFunction((int) socket_id,
responseType, pRI->token, e, response, responselen);
rwlockRet = pthread_rwlock_unlock(radioServiceRwlockPtr);
@@ -4493,7 +1602,7 @@
assert(rwlockRet == 0);
ret = s_unsolResponses[unsolResponseIndex].responseFunction(
- p, (int) soc_id, unsolResponse, responseType, 0, RIL_E_SUCCESS, const_cast<void*>(data),
+ (int) soc_id, responseType, 0, RIL_E_SUCCESS, const_cast<void*>(data),
datalen);
rwlockRet = pthread_rwlock_unlock(radioServiceRwlockPtr);
diff --git a/libril/ril_commands.h b/libril/ril_commands.h
index 95ea491..c9ec0cc 100644
--- a/libril/ril_commands.h
+++ b/libril/ril_commands.h
@@ -14,144 +14,144 @@
** See the License for the specific language governing permissions and
** limitations under the License.
*/
- {0, NULL, NULL}, //none
- {RIL_REQUEST_GET_SIM_STATUS, dispatchVoid, radio::getIccCardStatusResponse},
- {RIL_REQUEST_ENTER_SIM_PIN, dispatchStrings, radio::supplyIccPinForAppResponse},
- {RIL_REQUEST_ENTER_SIM_PUK, dispatchStrings, radio::supplyIccPukForAppResponse},
- {RIL_REQUEST_ENTER_SIM_PIN2, dispatchStrings, radio::supplyIccPin2ForAppResponse},
- {RIL_REQUEST_ENTER_SIM_PUK2, dispatchStrings, radio::supplyIccPuk2ForAppResponse},
- {RIL_REQUEST_CHANGE_SIM_PIN, dispatchStrings, radio::changeIccPinForAppResponse},
- {RIL_REQUEST_CHANGE_SIM_PIN2, dispatchStrings, radio::changeIccPin2ForAppResponse},
- {RIL_REQUEST_ENTER_NETWORK_DEPERSONALIZATION, dispatchStrings, radio::supplyNetworkDepersonalizationResponse},
- {RIL_REQUEST_GET_CURRENT_CALLS, dispatchVoid, radio::getCurrentCallsResponse},
- {RIL_REQUEST_DIAL, dispatchDial, radio::dialResponse},
- {RIL_REQUEST_GET_IMSI, dispatchStrings, radio::getIMSIForAppResponse},
- {RIL_REQUEST_HANGUP, dispatchInts, radio::hangupConnectionResponse},
- {RIL_REQUEST_HANGUP_WAITING_OR_BACKGROUND, dispatchVoid, radio::hangupWaitingOrBackgroundResponse},
- {RIL_REQUEST_HANGUP_FOREGROUND_RESUME_BACKGROUND, dispatchVoid, radio::hangupForegroundResumeBackgroundResponse},
- {RIL_REQUEST_SWITCH_WAITING_OR_HOLDING_AND_ACTIVE, dispatchVoid, radio::switchWaitingOrHoldingAndActiveResponse},
- {RIL_REQUEST_CONFERENCE, dispatchVoid, radio::conferenceResponse},
- {RIL_REQUEST_UDUB, dispatchVoid, radio::rejectCallResponse},
- {RIL_REQUEST_LAST_CALL_FAIL_CAUSE, dispatchVoid, radio::getLastCallFailCauseResponse},
- {RIL_REQUEST_SIGNAL_STRENGTH, dispatchVoid, radio::getSignalStrengthResponse},
- {RIL_REQUEST_VOICE_REGISTRATION_STATE, dispatchVoid, radio::getVoiceRegistrationStateResponse},
- {RIL_REQUEST_DATA_REGISTRATION_STATE, dispatchVoid, radio::getDataRegistrationStateResponse},
- {RIL_REQUEST_OPERATOR, dispatchVoid, radio::getOperatorResponse},
- {RIL_REQUEST_RADIO_POWER, dispatchInts, radio::setRadioPowerResponse},
- {RIL_REQUEST_DTMF, dispatchString, radio::sendDtmfResponse},
- {RIL_REQUEST_SEND_SMS, dispatchStrings, radio::sendSmsResponse},
- {RIL_REQUEST_SEND_SMS_EXPECT_MORE, dispatchStrings, radio::sendSMSExpectMoreResponse},
- {RIL_REQUEST_SETUP_DATA_CALL, dispatchDataCall, radio::setupDataCallResponse},
- {RIL_REQUEST_SIM_IO, dispatchSIM_IO, radio::iccIOForAppResponse},
- {RIL_REQUEST_SEND_USSD, dispatchString, radio::sendUssdResponse},
- {RIL_REQUEST_CANCEL_USSD, dispatchVoid, radio::cancelPendingUssdResponse},
- {RIL_REQUEST_GET_CLIR, dispatchVoid, radio::getClirResponse},
- {RIL_REQUEST_SET_CLIR, dispatchInts, radio::setClirResponse},
- {RIL_REQUEST_QUERY_CALL_FORWARD_STATUS, dispatchCallForward, radio::getCallForwardStatusResponse},
- {RIL_REQUEST_SET_CALL_FORWARD, dispatchCallForward, radio::setCallForwardResponse},
- {RIL_REQUEST_QUERY_CALL_WAITING, dispatchInts, radio::getCallWaitingResponse},
- {RIL_REQUEST_SET_CALL_WAITING, dispatchInts, radio::setCallWaitingResponse},
- {RIL_REQUEST_SMS_ACKNOWLEDGE, dispatchInts, radio::acknowledgeLastIncomingGsmSmsResponse},
- {RIL_REQUEST_GET_IMEI, dispatchVoid, responseString},
- {RIL_REQUEST_GET_IMEISV, dispatchVoid, responseString},
- {RIL_REQUEST_ANSWER,dispatchVoid, radio::acceptCallResponse},
- {RIL_REQUEST_DEACTIVATE_DATA_CALL, dispatchStrings, radio::deactivateDataCallResponse},
- {RIL_REQUEST_QUERY_FACILITY_LOCK, dispatchStrings, radio::getFacilityLockForAppResponse},
- {RIL_REQUEST_SET_FACILITY_LOCK, dispatchStrings, radio::setFacilityLockForAppResponse},
- {RIL_REQUEST_CHANGE_BARRING_PASSWORD, dispatchStrings, radio::setBarringPasswordResponse},
- {RIL_REQUEST_QUERY_NETWORK_SELECTION_MODE, dispatchVoid, radio::getNetworkSelectionModeResponse},
- {RIL_REQUEST_SET_NETWORK_SELECTION_AUTOMATIC, dispatchVoid, radio::setNetworkSelectionModeAutomaticResponse},
- {RIL_REQUEST_SET_NETWORK_SELECTION_MANUAL, dispatchString, radio::setNetworkSelectionModeManualResponse},
- {RIL_REQUEST_QUERY_AVAILABLE_NETWORKS , dispatchVoid, radio::getAvailableNetworksResponse},
- {RIL_REQUEST_DTMF_START, dispatchString, radio::startDtmfResponse},
- {RIL_REQUEST_DTMF_STOP, dispatchVoid, radio::stopDtmfResponse},
- {RIL_REQUEST_BASEBAND_VERSION, dispatchVoid, radio::getBasebandVersionResponse},
- {RIL_REQUEST_SEPARATE_CONNECTION, dispatchInts, radio::separateConnectionResponse},
- {RIL_REQUEST_SET_MUTE, dispatchInts, radio::setMuteResponse},
- {RIL_REQUEST_GET_MUTE, dispatchVoid, radio::getMuteResponse},
- {RIL_REQUEST_QUERY_CLIP, dispatchVoid, radio::getClipResponse},
- {RIL_REQUEST_LAST_DATA_CALL_FAIL_CAUSE, dispatchVoid, responseInts},
- {RIL_REQUEST_DATA_CALL_LIST, dispatchVoid, radio::getDataCallListResponse},
- {RIL_REQUEST_RESET_RADIO, dispatchVoid, responseVoid},
- {RIL_REQUEST_OEM_HOOK_RAW, dispatchRaw, radio::sendRequestRawResponse},
- {RIL_REQUEST_OEM_HOOK_STRINGS, dispatchStrings, radio::sendRequestStringsResponse},
- {RIL_REQUEST_SCREEN_STATE, dispatchInts, radio::sendDeviceStateResponse}, // Note the response function is different.
- {RIL_REQUEST_SET_SUPP_SVC_NOTIFICATION, dispatchInts, radio::setSuppServiceNotificationsResponse},
- {RIL_REQUEST_WRITE_SMS_TO_SIM, dispatchSmsWrite, radio::writeSmsToSimResponse},
- {RIL_REQUEST_DELETE_SMS_ON_SIM, dispatchInts, radio::deleteSmsOnSimResponse},
- {RIL_REQUEST_SET_BAND_MODE, dispatchInts, radio::setBandModeResponse},
- {RIL_REQUEST_QUERY_AVAILABLE_BAND_MODE, dispatchVoid, radio::getAvailableBandModesResponse},
- {RIL_REQUEST_STK_GET_PROFILE, dispatchVoid, NULL},
- {RIL_REQUEST_STK_SET_PROFILE, dispatchString, NULL},
- {RIL_REQUEST_STK_SEND_ENVELOPE_COMMAND, dispatchString, radio::sendEnvelopeResponse},
- {RIL_REQUEST_STK_SEND_TERMINAL_RESPONSE, dispatchString, radio::sendTerminalResponseToSimResponse},
- {RIL_REQUEST_STK_HANDLE_CALL_SETUP_REQUESTED_FROM_SIM, dispatchInts, radio::handleStkCallSetupRequestFromSimResponse},
- {RIL_REQUEST_EXPLICIT_CALL_TRANSFER, dispatchVoid, radio::explicitCallTransferResponse},
- {RIL_REQUEST_SET_PREFERRED_NETWORK_TYPE, dispatchInts, radio::setPreferredNetworkTypeResponse},
- {RIL_REQUEST_GET_PREFERRED_NETWORK_TYPE, dispatchVoid, radio::getPreferredNetworkTypeResponse},
- {RIL_REQUEST_GET_NEIGHBORING_CELL_IDS, dispatchVoid, radio::getNeighboringCidsResponse},
- {RIL_REQUEST_SET_LOCATION_UPDATES, dispatchInts, radio::setLocationUpdatesResponse},
- {RIL_REQUEST_CDMA_SET_SUBSCRIPTION_SOURCE, dispatchInts, radio::setCdmaSubscriptionSourceResponse},
- {RIL_REQUEST_CDMA_SET_ROAMING_PREFERENCE, dispatchInts, radio::setCdmaRoamingPreferenceResponse},
- {RIL_REQUEST_CDMA_QUERY_ROAMING_PREFERENCE, dispatchVoid, radio::getCdmaRoamingPreferenceResponse},
- {RIL_REQUEST_SET_TTY_MODE, dispatchInts, radio::setTTYModeResponse},
- {RIL_REQUEST_QUERY_TTY_MODE, dispatchVoid, radio::getTTYModeResponse},
- {RIL_REQUEST_CDMA_SET_PREFERRED_VOICE_PRIVACY_MODE, dispatchInts, radio::setPreferredVoicePrivacyResponse},
- {RIL_REQUEST_CDMA_QUERY_PREFERRED_VOICE_PRIVACY_MODE, dispatchVoid, radio::getPreferredVoicePrivacyResponse},
- {RIL_REQUEST_CDMA_FLASH, dispatchString, radio::sendCDMAFeatureCodeResponse},
- {RIL_REQUEST_CDMA_BURST_DTMF, dispatchStrings, radio::sendBurstDtmfResponse},
- {RIL_REQUEST_CDMA_VALIDATE_AND_WRITE_AKEY, dispatchString, NULL},
- {RIL_REQUEST_CDMA_SEND_SMS, dispatchCdmaSms, radio::sendCdmaSmsResponse},
- {RIL_REQUEST_CDMA_SMS_ACKNOWLEDGE, dispatchCdmaSmsAck, radio::acknowledgeLastIncomingCdmaSmsResponse},
- {RIL_REQUEST_GSM_GET_BROADCAST_SMS_CONFIG, dispatchVoid, radio::getGsmBroadcastConfigResponse},
- {RIL_REQUEST_GSM_SET_BROADCAST_SMS_CONFIG, dispatchGsmBrSmsCnf, radio::setGsmBroadcastConfigResponse},
- {RIL_REQUEST_GSM_SMS_BROADCAST_ACTIVATION, dispatchInts, radio::setGsmBroadcastActivationResponse},
- {RIL_REQUEST_CDMA_GET_BROADCAST_SMS_CONFIG, dispatchVoid, radio::getCdmaBroadcastConfigResponse},
- {RIL_REQUEST_CDMA_SET_BROADCAST_SMS_CONFIG, dispatchCdmaBrSmsCnf, radio::setCdmaBroadcastConfigResponse},
- {RIL_REQUEST_CDMA_SMS_BROADCAST_ACTIVATION, dispatchInts, radio::setCdmaBroadcastActivationResponse},
- {RIL_REQUEST_CDMA_SUBSCRIPTION, dispatchVoid, radio::getCDMASubscriptionResponse},
- {RIL_REQUEST_CDMA_WRITE_SMS_TO_RUIM, dispatchRilCdmaSmsWriteArgs, radio::writeSmsToRuimResponse},
- {RIL_REQUEST_CDMA_DELETE_SMS_ON_RUIM, dispatchInts, radio::deleteSmsOnRuimResponse},
- {RIL_REQUEST_DEVICE_IDENTITY, dispatchVoid, radio::getDeviceIdentityResponse},
- {RIL_REQUEST_EXIT_EMERGENCY_CALLBACK_MODE, dispatchVoid, radio::exitEmergencyCallbackModeResponse},
- {RIL_REQUEST_GET_SMSC_ADDRESS, dispatchVoid, radio::getSmscAddressResponse},
- {RIL_REQUEST_SET_SMSC_ADDRESS, dispatchString, radio::setSmscAddressResponse},
- {RIL_REQUEST_REPORT_SMS_MEMORY_STATUS, dispatchInts, radio::reportSmsMemoryStatusResponse},
- {RIL_REQUEST_REPORT_STK_SERVICE_IS_RUNNING, dispatchVoid, radio::reportStkServiceIsRunningResponse},
- {RIL_REQUEST_CDMA_GET_SUBSCRIPTION_SOURCE, dispatchVoid, radio::getCdmaSubscriptionSourceResponse},
- {RIL_REQUEST_ISIM_AUTHENTICATION, dispatchString, radio::requestIsimAuthenticationResponse},
- {RIL_REQUEST_ACKNOWLEDGE_INCOMING_GSM_SMS_WITH_PDU, dispatchStrings, radio::acknowledgeIncomingGsmSmsWithPduResponse},
- {RIL_REQUEST_STK_SEND_ENVELOPE_WITH_STATUS, dispatchString, radio::sendEnvelopeWithStatusResponse},
- {RIL_REQUEST_VOICE_RADIO_TECH, dispatchVoid, radio::getVoiceRadioTechnologyResponse},
- {RIL_REQUEST_GET_CELL_INFO_LIST, dispatchVoid, radio::getCellInfoListResponse},
- {RIL_REQUEST_SET_UNSOL_CELL_INFO_LIST_RATE, dispatchInts, radio::setCellInfoListRateResponse},
- {RIL_REQUEST_SET_INITIAL_ATTACH_APN, dispatchSetInitialAttachApn, radio::setInitialAttachApnResponse},
- {RIL_REQUEST_IMS_REGISTRATION_STATE, dispatchVoid, radio::getImsRegistrationStateResponse},
- {RIL_REQUEST_IMS_SEND_SMS, dispatchImsSms, radio::sendImsSmsResponse},
- {RIL_REQUEST_SIM_TRANSMIT_APDU_BASIC, dispatchSIM_APDU, radio::iccTransmitApduBasicChannelResponse},
- {RIL_REQUEST_SIM_OPEN_CHANNEL, dispatchString, radio::iccOpenLogicalChannelResponse},
- {RIL_REQUEST_SIM_CLOSE_CHANNEL, dispatchInts, radio::iccCloseLogicalChannelResponse},
- {RIL_REQUEST_SIM_TRANSMIT_APDU_CHANNEL, dispatchSIM_APDU, radio::iccTransmitApduLogicalChannelResponse},
- {RIL_REQUEST_NV_READ_ITEM, dispatchNVReadItem, radio::nvReadItemResponse},
- {RIL_REQUEST_NV_WRITE_ITEM, dispatchNVWriteItem, radio::nvWriteItemResponse},
- {RIL_REQUEST_NV_WRITE_CDMA_PRL, dispatchRaw, radio::nvWriteCdmaPrlResponse},
- {RIL_REQUEST_NV_RESET_CONFIG, dispatchInts, radio::nvResetConfigResponse},
- {RIL_REQUEST_SET_UICC_SUBSCRIPTION, dispatchUiccSubscripton, radio::setUiccSubscriptionResponse},
- {RIL_REQUEST_ALLOW_DATA, dispatchInts, radio::setDataAllowedResponse},
- {RIL_REQUEST_GET_HARDWARE_CONFIG, dispatchVoid, radio::getHardwareConfigResponse},
- {RIL_REQUEST_SIM_AUTHENTICATION, dispatchSimAuthentication, radio::requestIccSimAuthenticationResponse},
- {RIL_REQUEST_GET_DC_RT_INFO, dispatchVoid, responseDcRtInfo},
- {RIL_REQUEST_SET_DC_RT_INFO_RATE, dispatchInts, responseVoid},
- {RIL_REQUEST_SET_DATA_PROFILE, dispatchDataProfile, radio::setDataProfileResponse},
- {RIL_REQUEST_SHUTDOWN, dispatchVoid, radio::requestShutdownResponse},
- {RIL_REQUEST_GET_RADIO_CAPABILITY, dispatchVoid, radio::getRadioCapabilityResponse},
- {RIL_REQUEST_SET_RADIO_CAPABILITY, dispatchRadioCapability, radio::setRadioCapabilityResponse},
- {RIL_REQUEST_START_LCE, dispatchInts, radio::startLceServiceResponse},
- {RIL_REQUEST_STOP_LCE, dispatchVoid, radio::stopLceServiceResponse},
- {RIL_REQUEST_PULL_LCEDATA, dispatchVoid, radio::pullLceDataResponse},
- {RIL_REQUEST_GET_ACTIVITY_INFO, dispatchVoid, radio::getModemActivityInfoResponse},
- {RIL_REQUEST_SET_CARRIER_RESTRICTIONS, dispatchCarrierRestrictions, radio::setAllowedCarriersResponse},
- {RIL_REQUEST_GET_CARRIER_RESTRICTIONS, dispatchVoid, radio::getAllowedCarriersResponse},
- {RIL_REQUEST_SEND_DEVICE_STATE, dispatchInts, radio::sendDeviceStateResponse},
- {RIL_REQUEST_SET_UNSOLICITED_RESPONSE_FILTER, dispatchInts, radio::setIndicationFilterResponse},
- {RIL_REQUEST_SET_SIM_CARD_POWER, dispatchInts, radio::setSimCardPowerResponse},
+ {0, NULL}, //none
+ {RIL_REQUEST_GET_SIM_STATUS, radio::getIccCardStatusResponse},
+ {RIL_REQUEST_ENTER_SIM_PIN, radio::supplyIccPinForAppResponse},
+ {RIL_REQUEST_ENTER_SIM_PUK, radio::supplyIccPukForAppResponse},
+ {RIL_REQUEST_ENTER_SIM_PIN2, radio::supplyIccPin2ForAppResponse},
+ {RIL_REQUEST_ENTER_SIM_PUK2, radio::supplyIccPuk2ForAppResponse},
+ {RIL_REQUEST_CHANGE_SIM_PIN, radio::changeIccPinForAppResponse},
+ {RIL_REQUEST_CHANGE_SIM_PIN2, radio::changeIccPin2ForAppResponse},
+ {RIL_REQUEST_ENTER_NETWORK_DEPERSONALIZATION, radio::supplyNetworkDepersonalizationResponse},
+ {RIL_REQUEST_GET_CURRENT_CALLS, radio::getCurrentCallsResponse},
+ {RIL_REQUEST_DIAL, radio::dialResponse},
+ {RIL_REQUEST_GET_IMSI, radio::getIMSIForAppResponse},
+ {RIL_REQUEST_HANGUP, radio::hangupConnectionResponse},
+ {RIL_REQUEST_HANGUP_WAITING_OR_BACKGROUND, radio::hangupWaitingOrBackgroundResponse},
+ {RIL_REQUEST_HANGUP_FOREGROUND_RESUME_BACKGROUND, radio::hangupForegroundResumeBackgroundResponse},
+ {RIL_REQUEST_SWITCH_WAITING_OR_HOLDING_AND_ACTIVE, radio::switchWaitingOrHoldingAndActiveResponse},
+ {RIL_REQUEST_CONFERENCE, radio::conferenceResponse},
+ {RIL_REQUEST_UDUB, radio::rejectCallResponse},
+ {RIL_REQUEST_LAST_CALL_FAIL_CAUSE, radio::getLastCallFailCauseResponse},
+ {RIL_REQUEST_SIGNAL_STRENGTH, radio::getSignalStrengthResponse},
+ {RIL_REQUEST_VOICE_REGISTRATION_STATE, radio::getVoiceRegistrationStateResponse},
+ {RIL_REQUEST_DATA_REGISTRATION_STATE, radio::getDataRegistrationStateResponse},
+ {RIL_REQUEST_OPERATOR, radio::getOperatorResponse},
+ {RIL_REQUEST_RADIO_POWER, radio::setRadioPowerResponse},
+ {RIL_REQUEST_DTMF, radio::sendDtmfResponse},
+ {RIL_REQUEST_SEND_SMS, radio::sendSmsResponse},
+ {RIL_REQUEST_SEND_SMS_EXPECT_MORE, radio::sendSMSExpectMoreResponse},
+ {RIL_REQUEST_SETUP_DATA_CALL, radio::setupDataCallResponse},
+ {RIL_REQUEST_SIM_IO, radio::iccIOForAppResponse},
+ {RIL_REQUEST_SEND_USSD, radio::sendUssdResponse},
+ {RIL_REQUEST_CANCEL_USSD, radio::cancelPendingUssdResponse},
+ {RIL_REQUEST_GET_CLIR, radio::getClirResponse},
+ {RIL_REQUEST_SET_CLIR, radio::setClirResponse},
+ {RIL_REQUEST_QUERY_CALL_FORWARD_STATUS, radio::getCallForwardStatusResponse},
+ {RIL_REQUEST_SET_CALL_FORWARD, radio::setCallForwardResponse},
+ {RIL_REQUEST_QUERY_CALL_WAITING, radio::getCallWaitingResponse},
+ {RIL_REQUEST_SET_CALL_WAITING, radio::setCallWaitingResponse},
+ {RIL_REQUEST_SMS_ACKNOWLEDGE, radio::acknowledgeLastIncomingGsmSmsResponse},
+ {RIL_REQUEST_GET_IMEI, NULL},
+ {RIL_REQUEST_GET_IMEISV, NULL},
+ {RIL_REQUEST_ANSWER, radio::acceptCallResponse},
+ {RIL_REQUEST_DEACTIVATE_DATA_CALL, radio::deactivateDataCallResponse},
+ {RIL_REQUEST_QUERY_FACILITY_LOCK, radio::getFacilityLockForAppResponse},
+ {RIL_REQUEST_SET_FACILITY_LOCK, radio::setFacilityLockForAppResponse},
+ {RIL_REQUEST_CHANGE_BARRING_PASSWORD, radio::setBarringPasswordResponse},
+ {RIL_REQUEST_QUERY_NETWORK_SELECTION_MODE, radio::getNetworkSelectionModeResponse},
+ {RIL_REQUEST_SET_NETWORK_SELECTION_AUTOMATIC, radio::setNetworkSelectionModeAutomaticResponse},
+ {RIL_REQUEST_SET_NETWORK_SELECTION_MANUAL, radio::setNetworkSelectionModeManualResponse},
+ {RIL_REQUEST_QUERY_AVAILABLE_NETWORKS , radio::getAvailableNetworksResponse},
+ {RIL_REQUEST_DTMF_START, radio::startDtmfResponse},
+ {RIL_REQUEST_DTMF_STOP, radio::stopDtmfResponse},
+ {RIL_REQUEST_BASEBAND_VERSION, radio::getBasebandVersionResponse},
+ {RIL_REQUEST_SEPARATE_CONNECTION, radio::separateConnectionResponse},
+ {RIL_REQUEST_SET_MUTE, radio::setMuteResponse},
+ {RIL_REQUEST_GET_MUTE, radio::getMuteResponse},
+ {RIL_REQUEST_QUERY_CLIP, radio::getClipResponse},
+ {RIL_REQUEST_LAST_DATA_CALL_FAIL_CAUSE, NULL},
+ {RIL_REQUEST_DATA_CALL_LIST, radio::getDataCallListResponse},
+ {RIL_REQUEST_RESET_RADIO, NULL},
+ {RIL_REQUEST_OEM_HOOK_RAW, radio::sendRequestRawResponse},
+ {RIL_REQUEST_OEM_HOOK_STRINGS, radio::sendRequestStringsResponse},
+ {RIL_REQUEST_SCREEN_STATE, radio::sendDeviceStateResponse}, // Note the response function is different.
+ {RIL_REQUEST_SET_SUPP_SVC_NOTIFICATION, radio::setSuppServiceNotificationsResponse},
+ {RIL_REQUEST_WRITE_SMS_TO_SIM, radio::writeSmsToSimResponse},
+ {RIL_REQUEST_DELETE_SMS_ON_SIM, radio::deleteSmsOnSimResponse},
+ {RIL_REQUEST_SET_BAND_MODE, radio::setBandModeResponse},
+ {RIL_REQUEST_QUERY_AVAILABLE_BAND_MODE, radio::getAvailableBandModesResponse},
+ {RIL_REQUEST_STK_GET_PROFILE, NULL},
+ {RIL_REQUEST_STK_SET_PROFILE, NULL},
+ {RIL_REQUEST_STK_SEND_ENVELOPE_COMMAND, radio::sendEnvelopeResponse},
+ {RIL_REQUEST_STK_SEND_TERMINAL_RESPONSE, radio::sendTerminalResponseToSimResponse},
+ {RIL_REQUEST_STK_HANDLE_CALL_SETUP_REQUESTED_FROM_SIM, radio::handleStkCallSetupRequestFromSimResponse},
+ {RIL_REQUEST_EXPLICIT_CALL_TRANSFER, radio::explicitCallTransferResponse},
+ {RIL_REQUEST_SET_PREFERRED_NETWORK_TYPE, radio::setPreferredNetworkTypeResponse},
+ {RIL_REQUEST_GET_PREFERRED_NETWORK_TYPE, radio::getPreferredNetworkTypeResponse},
+ {RIL_REQUEST_GET_NEIGHBORING_CELL_IDS, radio::getNeighboringCidsResponse},
+ {RIL_REQUEST_SET_LOCATION_UPDATES, radio::setLocationUpdatesResponse},
+ {RIL_REQUEST_CDMA_SET_SUBSCRIPTION_SOURCE, radio::setCdmaSubscriptionSourceResponse},
+ {RIL_REQUEST_CDMA_SET_ROAMING_PREFERENCE, radio::setCdmaRoamingPreferenceResponse},
+ {RIL_REQUEST_CDMA_QUERY_ROAMING_PREFERENCE, radio::getCdmaRoamingPreferenceResponse},
+ {RIL_REQUEST_SET_TTY_MODE, radio::setTTYModeResponse},
+ {RIL_REQUEST_QUERY_TTY_MODE, radio::getTTYModeResponse},
+ {RIL_REQUEST_CDMA_SET_PREFERRED_VOICE_PRIVACY_MODE, radio::setPreferredVoicePrivacyResponse},
+ {RIL_REQUEST_CDMA_QUERY_PREFERRED_VOICE_PRIVACY_MODE, radio::getPreferredVoicePrivacyResponse},
+ {RIL_REQUEST_CDMA_FLASH, radio::sendCDMAFeatureCodeResponse},
+ {RIL_REQUEST_CDMA_BURST_DTMF, radio::sendBurstDtmfResponse},
+ {RIL_REQUEST_CDMA_VALIDATE_AND_WRITE_AKEY, NULL},
+ {RIL_REQUEST_CDMA_SEND_SMS, radio::sendCdmaSmsResponse},
+ {RIL_REQUEST_CDMA_SMS_ACKNOWLEDGE, radio::acknowledgeLastIncomingCdmaSmsResponse},
+ {RIL_REQUEST_GSM_GET_BROADCAST_SMS_CONFIG, radio::getGsmBroadcastConfigResponse},
+ {RIL_REQUEST_GSM_SET_BROADCAST_SMS_CONFIG, radio::setGsmBroadcastConfigResponse},
+ {RIL_REQUEST_GSM_SMS_BROADCAST_ACTIVATION, radio::setGsmBroadcastActivationResponse},
+ {RIL_REQUEST_CDMA_GET_BROADCAST_SMS_CONFIG, radio::getCdmaBroadcastConfigResponse},
+ {RIL_REQUEST_CDMA_SET_BROADCAST_SMS_CONFIG, radio::setCdmaBroadcastConfigResponse},
+ {RIL_REQUEST_CDMA_SMS_BROADCAST_ACTIVATION, radio::setCdmaBroadcastActivationResponse},
+ {RIL_REQUEST_CDMA_SUBSCRIPTION, radio::getCDMASubscriptionResponse},
+ {RIL_REQUEST_CDMA_WRITE_SMS_TO_RUIM, radio::writeSmsToRuimResponse},
+ {RIL_REQUEST_CDMA_DELETE_SMS_ON_RUIM, radio::deleteSmsOnRuimResponse},
+ {RIL_REQUEST_DEVICE_IDENTITY, radio::getDeviceIdentityResponse},
+ {RIL_REQUEST_EXIT_EMERGENCY_CALLBACK_MODE, radio::exitEmergencyCallbackModeResponse},
+ {RIL_REQUEST_GET_SMSC_ADDRESS, radio::getSmscAddressResponse},
+ {RIL_REQUEST_SET_SMSC_ADDRESS, radio::setSmscAddressResponse},
+ {RIL_REQUEST_REPORT_SMS_MEMORY_STATUS, radio::reportSmsMemoryStatusResponse},
+ {RIL_REQUEST_REPORT_STK_SERVICE_IS_RUNNING, radio::reportStkServiceIsRunningResponse},
+ {RIL_REQUEST_CDMA_GET_SUBSCRIPTION_SOURCE, radio::getCdmaSubscriptionSourceResponse},
+ {RIL_REQUEST_ISIM_AUTHENTICATION, radio::requestIsimAuthenticationResponse},
+ {RIL_REQUEST_ACKNOWLEDGE_INCOMING_GSM_SMS_WITH_PDU, radio::acknowledgeIncomingGsmSmsWithPduResponse},
+ {RIL_REQUEST_STK_SEND_ENVELOPE_WITH_STATUS, radio::sendEnvelopeWithStatusResponse},
+ {RIL_REQUEST_VOICE_RADIO_TECH, radio::getVoiceRadioTechnologyResponse},
+ {RIL_REQUEST_GET_CELL_INFO_LIST, radio::getCellInfoListResponse},
+ {RIL_REQUEST_SET_UNSOL_CELL_INFO_LIST_RATE, radio::setCellInfoListRateResponse},
+ {RIL_REQUEST_SET_INITIAL_ATTACH_APN, radio::setInitialAttachApnResponse},
+ {RIL_REQUEST_IMS_REGISTRATION_STATE, radio::getImsRegistrationStateResponse},
+ {RIL_REQUEST_IMS_SEND_SMS, radio::sendImsSmsResponse},
+ {RIL_REQUEST_SIM_TRANSMIT_APDU_BASIC, radio::iccTransmitApduBasicChannelResponse},
+ {RIL_REQUEST_SIM_OPEN_CHANNEL, radio::iccOpenLogicalChannelResponse},
+ {RIL_REQUEST_SIM_CLOSE_CHANNEL, radio::iccCloseLogicalChannelResponse},
+ {RIL_REQUEST_SIM_TRANSMIT_APDU_CHANNEL, radio::iccTransmitApduLogicalChannelResponse},
+ {RIL_REQUEST_NV_READ_ITEM, radio::nvReadItemResponse},
+ {RIL_REQUEST_NV_WRITE_ITEM, radio::nvWriteItemResponse},
+ {RIL_REQUEST_NV_WRITE_CDMA_PRL, radio::nvWriteCdmaPrlResponse},
+ {RIL_REQUEST_NV_RESET_CONFIG, radio::nvResetConfigResponse},
+ {RIL_REQUEST_SET_UICC_SUBSCRIPTION, radio::setUiccSubscriptionResponse},
+ {RIL_REQUEST_ALLOW_DATA, radio::setDataAllowedResponse},
+ {RIL_REQUEST_GET_HARDWARE_CONFIG, radio::getHardwareConfigResponse},
+ {RIL_REQUEST_SIM_AUTHENTICATION, radio::requestIccSimAuthenticationResponse},
+ {RIL_REQUEST_GET_DC_RT_INFO, NULL},
+ {RIL_REQUEST_SET_DC_RT_INFO_RATE, NULL},
+ {RIL_REQUEST_SET_DATA_PROFILE, radio::setDataProfileResponse},
+ {RIL_REQUEST_SHUTDOWN, radio::requestShutdownResponse},
+ {RIL_REQUEST_GET_RADIO_CAPABILITY, radio::getRadioCapabilityResponse},
+ {RIL_REQUEST_SET_RADIO_CAPABILITY, radio::setRadioCapabilityResponse},
+ {RIL_REQUEST_START_LCE, radio::startLceServiceResponse},
+ {RIL_REQUEST_STOP_LCE, radio::stopLceServiceResponse},
+ {RIL_REQUEST_PULL_LCEDATA, radio::pullLceDataResponse},
+ {RIL_REQUEST_GET_ACTIVITY_INFO, radio::getModemActivityInfoResponse},
+ {RIL_REQUEST_SET_CARRIER_RESTRICTIONS, radio::setAllowedCarriersResponse},
+ {RIL_REQUEST_GET_CARRIER_RESTRICTIONS, radio::getAllowedCarriersResponse},
+ {RIL_REQUEST_SEND_DEVICE_STATE, radio::sendDeviceStateResponse},
+ {RIL_REQUEST_SET_UNSOLICITED_RESPONSE_FILTER, radio::setIndicationFilterResponse},
+ {RIL_REQUEST_SET_SIM_CARD_POWER, radio::setSimCardPowerResponse},
diff --git a/libril/ril_internal.h b/libril/ril_internal.h
index 0eeff87..b7b101d 100644
--- a/libril/ril_internal.h
+++ b/libril/ril_internal.h
@@ -87,10 +87,7 @@
typedef struct CommandInfo {
int requestNumber;
- // todo: remove
- void (*dispatchFunction) (Parcel &p, struct RequestInfo *pRI);
- // todo: change parcel to serial
- int(*responseFunction) (Parcel &p, int slotId, int requestNumber, int responseType, int token,
+ int(*responseFunction) (int slotId, int responseType, int token,
RIL_Errno e, void *response, size_t responselen);
} CommandInfo;
diff --git a/libril/ril_service.cpp b/libril/ril_service.cpp
index 7e8ee4f..70c7fb6 100644
--- a/libril/ril_service.cpp
+++ b/libril/ril_service.cpp
@@ -246,8 +246,6 @@
Return<void> getDataCallList(int32_t serial);
- Return<void> sendScreenState(int32_t serial, bool enable);
-
Return<void> setSuppServiceNotifications(int32_t serial, bool enable);
Return<void> writeSmsToSim(int32_t serial,
@@ -459,8 +457,7 @@
}
void sendErrorResponse(RequestInfo *pRI, RIL_Errno err) {
- android::Parcel p; // TODO: should delete this after translation of all commands is complete
- pRI->pCI->responseFunction(p, (int) pRI->socket_id, pRI->pCI->requestNumber,
+ pRI->pCI->responseFunction((int) pRI->socket_id,
(int) RadioResponseType::SOLICITED, pRI->token, err, NULL, 0);
}
@@ -747,7 +744,7 @@
Return<void> RadioImpl::setResponseFunctions(
const ::android::sp<IRadioResponse>& radioResponseParam,
const ::android::sp<IRadioIndication>& radioIndicationParam) {
- RLOGD("RadioImpl::setResponseFunctions");
+ RLOGD("setResponseFunctions");
pthread_rwlock_t *radioServiceRwlockPtr = radio::getRadioServiceRwlock(mSlotId);
int ret = pthread_rwlock_wrlock(radioServiceRwlockPtr);
@@ -764,14 +761,14 @@
}
Return<void> RadioImpl::getIccCardStatus(int32_t serial) {
- RLOGD("RadioImpl::getIccCardStatus: serial %d", serial);
+ RLOGD("getIccCardStatus: serial %d", serial);
dispatchVoid(serial, mSlotId, RIL_REQUEST_GET_SIM_STATUS);
return Void();
}
Return<void> RadioImpl::supplyIccPinForApp(int32_t serial, const hidl_string& pin,
const hidl_string& aid) {
- RLOGD("RadioImpl::supplyIccPinForApp: serial %d", serial);
+ RLOGD("supplyIccPinForApp: serial %d", serial);
dispatchStrings(serial, mSlotId, RIL_REQUEST_ENTER_SIM_PIN,
2, (const char *)pin, (const char *)aid);
return Void();
@@ -779,7 +776,7 @@
Return<void> RadioImpl::supplyIccPukForApp(int32_t serial, const hidl_string& puk,
const hidl_string& pin, const hidl_string& aid) {
- RLOGD("RadioImpl::supplyIccPukForApp: serial %d", serial);
+ RLOGD("supplyIccPukForApp: serial %d", serial);
dispatchStrings(serial, mSlotId, RIL_REQUEST_ENTER_SIM_PUK,
3, (const char *)puk, (const char *)pin, (const char *)aid);
return Void();
@@ -787,7 +784,7 @@
Return<void> RadioImpl::supplyIccPin2ForApp(int32_t serial, const hidl_string& pin2,
const hidl_string& aid) {
- RLOGD("RadioImpl::supplyIccPin2ForApp: serial %d", serial);
+ RLOGD("supplyIccPin2ForApp: serial %d", serial);
dispatchStrings(serial, mSlotId, RIL_REQUEST_ENTER_SIM_PIN2,
2, (const char *)pin2, (const char *)aid);
return Void();
@@ -795,7 +792,7 @@
Return<void> RadioImpl::supplyIccPuk2ForApp(int32_t serial, const hidl_string& puk2,
const hidl_string& pin2, const hidl_string& aid) {
- RLOGD("RadioImpl::supplyIccPuk2ForApp: serial %d", serial);
+ RLOGD("supplyIccPuk2ForApp: serial %d", serial);
dispatchStrings(serial, mSlotId, RIL_REQUEST_ENTER_SIM_PUK2,
3, (const char *)puk2, (const char *)pin2, (const char *)aid);
return Void();
@@ -803,7 +800,7 @@
Return<void> RadioImpl::changeIccPinForApp(int32_t serial, const hidl_string& oldPin,
const hidl_string& newPin, const hidl_string& aid) {
- RLOGD("RadioImpl::changeIccPinForApp: serial %d", serial);
+ RLOGD("changeIccPinForApp: serial %d", serial);
dispatchStrings(serial, mSlotId, RIL_REQUEST_CHANGE_SIM_PIN,
3, (const char *)oldPin, (const char *)newPin, (const char *)aid);
return Void();
@@ -811,7 +808,7 @@
Return<void> RadioImpl::changeIccPin2ForApp(int32_t serial, const hidl_string& oldPin2,
const hidl_string& newPin2, const hidl_string& aid) {
- RLOGD("RadioImpl::changeIccPin2ForApp: serial %d", serial);
+ RLOGD("changeIccPin2ForApp: serial %d", serial);
dispatchStrings(serial, mSlotId, RIL_REQUEST_CHANGE_SIM_PIN2,
3, (const char *)oldPin2, (const char *)newPin2, (const char *)aid);
return Void();
@@ -819,20 +816,20 @@
Return<void> RadioImpl::supplyNetworkDepersonalization(int32_t serial,
const hidl_string& netPin) {
- RLOGD("RadioImpl::supplyNetworkDepersonalization: serial %d", serial);
+ RLOGD("supplyNetworkDepersonalization: serial %d", serial);
dispatchStrings(serial, mSlotId, RIL_REQUEST_ENTER_NETWORK_DEPERSONALIZATION,
1, (const char *)netPin);
return Void();
}
Return<void> RadioImpl::getCurrentCalls(int32_t serial) {
- RLOGD("RadioImpl::getCurrentCalls: serial %d", serial);
+ RLOGD("getCurrentCalls: serial %d", serial);
dispatchVoid(serial, mSlotId, RIL_REQUEST_GET_CURRENT_CALLS);
return Void();
}
Return<void> RadioImpl::dial(int32_t serial, const Dial& dialInfo) {
- RLOGD("RadioImpl::dial: serial %d", serial);
+ RLOGD("dial: serial %d", serial);
RequestInfo *pRI = android::addRequestToList(serial, mSlotId, RIL_REQUEST_DIAL);
if (pRI == NULL) {
return Void();
@@ -872,99 +869,99 @@
}
Return<void> RadioImpl::getImsiForApp(int32_t serial, const hidl_string& aid) {
- RLOGD("RadioImpl::getImsiForApp: serial %d", serial);
+ RLOGD("getImsiForApp: serial %d", serial);
dispatchStrings(serial, mSlotId, RIL_REQUEST_GET_IMSI,
1, (const char *) aid);
return Void();
}
Return<void> RadioImpl::hangup(int32_t serial, int32_t gsmIndex) {
- RLOGD("RadioImpl::hangup: serial %d", serial);
+ RLOGD("hangup: serial %d", serial);
dispatchInts(serial, mSlotId, RIL_REQUEST_HANGUP, 1, gsmIndex);
return Void();
}
Return<void> RadioImpl::hangupWaitingOrBackground(int32_t serial) {
- RLOGD("RadioImpl::hangupWaitingOrBackground: serial %d", serial);
+ RLOGD("hangupWaitingOrBackground: serial %d", serial);
dispatchVoid(serial, mSlotId, RIL_REQUEST_HANGUP_WAITING_OR_BACKGROUND);
return Void();
}
Return<void> RadioImpl::hangupForegroundResumeBackground(int32_t serial) {
- RLOGD("RadioImpl::hangupForegroundResumeBackground: serial %d", serial);
+ RLOGD("hangupForegroundResumeBackground: serial %d", serial);
dispatchVoid(serial, mSlotId, RIL_REQUEST_HANGUP_FOREGROUND_RESUME_BACKGROUND);
return Void();
}
Return<void> RadioImpl::switchWaitingOrHoldingAndActive(int32_t serial) {
- RLOGD("RadioImpl::switchWaitingOrHoldingAndActive: serial %d", serial);
+ RLOGD("switchWaitingOrHoldingAndActive: serial %d", serial);
dispatchVoid(serial, mSlotId, RIL_REQUEST_SWITCH_WAITING_OR_HOLDING_AND_ACTIVE);
return Void();
}
Return<void> RadioImpl::conference(int32_t serial) {
- RLOGD("RadioImpl::conference: serial %d", serial);
+ RLOGD("conference: serial %d", serial);
dispatchVoid(serial, mSlotId, RIL_REQUEST_CONFERENCE);
return Void();
}
Return<void> RadioImpl::rejectCall(int32_t serial) {
- RLOGD("RadioImpl::rejectCall: serial %d", serial);
+ RLOGD("rejectCall: serial %d", serial);
dispatchVoid(serial, mSlotId, RIL_REQUEST_UDUB);
return Void();
}
Return<void> RadioImpl::getLastCallFailCause(int32_t serial) {
- RLOGD("RadioImpl::getLastCallFailCause: serial %d", serial);
+ RLOGD("getLastCallFailCause: serial %d", serial);
dispatchVoid(serial, mSlotId, RIL_REQUEST_LAST_CALL_FAIL_CAUSE);
return Void();
}
Return<void> RadioImpl::getSignalStrength(int32_t serial) {
- RLOGD("RadioImpl::getSignalStrength: serial %d", serial);
+ RLOGD("getSignalStrength: serial %d", serial);
dispatchVoid(serial, mSlotId, RIL_REQUEST_SIGNAL_STRENGTH);
return Void();
}
Return<void> RadioImpl::getVoiceRegistrationState(int32_t serial) {
- RLOGD("RadioImpl::getVoiceRegistrationState: serial %d", serial);
+ RLOGD("getVoiceRegistrationState: serial %d", serial);
dispatchVoid(serial, mSlotId, RIL_REQUEST_VOICE_REGISTRATION_STATE);
return Void();
}
Return<void> RadioImpl::getDataRegistrationState(int32_t serial) {
- RLOGD("RadioImpl::getDataRegistrationState: serial %d", serial);
+ RLOGD("getDataRegistrationState: serial %d", serial);
dispatchVoid(serial, mSlotId, RIL_REQUEST_DATA_REGISTRATION_STATE);
return Void();
}
Return<void> RadioImpl::getOperator(int32_t serial) {
- RLOGD("RadioImpl::getOperator: serial %d", serial);
+ RLOGD("getOperator: serial %d", serial);
dispatchVoid(serial, mSlotId, RIL_REQUEST_OPERATOR);
return Void();
}
Return<void> RadioImpl::setRadioPower(int32_t serial, bool on) {
- RLOGD("RadioImpl::setRadioPower: serial %d on %d", serial, on);
+ RLOGD("setRadioPower: serial %d on %d", serial, on);
dispatchInts(serial, mSlotId, RIL_REQUEST_RADIO_POWER, 1, BOOL_TO_INT(on));
return Void();
}
Return<void> RadioImpl::sendDtmf(int32_t serial, const hidl_string& s) {
- RLOGD("RadioImpl::sendDtmf: serial %d", serial);
+ RLOGD("sendDtmf: serial %d", serial);
dispatchString(serial, mSlotId, RIL_REQUEST_DTMF, (const char *) s);
return Void();
}
Return<void> RadioImpl::sendSms(int32_t serial, const GsmSmsMessage& message) {
- RLOGD("RadioImpl::sendSms: serial %d", serial);
+ RLOGD("sendSms: serial %d", serial);
dispatchStrings(serial, mSlotId, RIL_REQUEST_SEND_SMS,
2, (const char *) message.smscPdu, (const char *) message.pdu);
return Void();
}
Return<void> RadioImpl::sendSMSExpectMore(int32_t serial, const GsmSmsMessage& message) {
- RLOGD("RadioImpl::sendSMSExpectMore: serial %d", serial);
+ RLOGD("sendSMSExpectMore: serial %d", serial);
dispatchStrings(serial, mSlotId, RIL_REQUEST_SEND_SMS_EXPECT_MORE,
2, (const char *) message.smscPdu, (const char *) message.pdu);
return Void();
@@ -983,7 +980,7 @@
const DataProfileInfo& dataProfileInfo, bool modemCognitive,
bool roamingAllowed, bool isRoaming) {
- RLOGD("RadioImpl::setupDataCall: serial %d", serial);
+ RLOGD("setupDataCall: serial %d", serial);
if (s_vendorFunctions->version >= 4 && s_vendorFunctions->version <= 14) {
const hidl_string &protocol =
@@ -1034,7 +1031,7 @@
}
Return<void> RadioImpl::iccIOForApp(int32_t serial, const IccIo& iccIo) {
- RLOGD("RadioImpl::iccIOForApp: serial %d", serial);
+ RLOGD("iccIOForApp: serial %d", serial);
RequestInfo *pRI = android::addRequestToList(serial, mSlotId, RIL_REQUEST_SIM_IO);
if (pRI == NULL) {
return Void();
@@ -1074,51 +1071,51 @@
}
Return<void> RadioImpl::sendUssd(int32_t serial, const hidl_string& ussd) {
- RLOGD("RadioImpl::sendUssd: serial %d", serial);
+ RLOGD("sendUssd: serial %d", serial);
dispatchString(serial, mSlotId, RIL_REQUEST_SEND_USSD, (const char *) ussd);
return Void();
}
Return<void> RadioImpl::cancelPendingUssd(int32_t serial) {
- RLOGD("RadioImpl::cancelPendingUssd: serial %d", serial);
+ RLOGD("cancelPendingUssd: serial %d", serial);
dispatchVoid(serial, mSlotId, RIL_REQUEST_CANCEL_USSD);
return Void();
}
Return<void> RadioImpl::getClir(int32_t serial) {
- RLOGD("RadioImpl::getClir: serial %d", serial);
+ RLOGD("getClir: serial %d", serial);
dispatchVoid(serial, mSlotId, RIL_REQUEST_GET_CLIR);
return Void();
}
Return<void> RadioImpl::setClir(int32_t serial, int32_t status) {
- RLOGD("RadioImpl::setClir: serial %d", serial);
+ RLOGD("setClir: serial %d", serial);
dispatchInts(serial, mSlotId, RIL_REQUEST_SET_CLIR, 1, status);
return Void();
}
Return<void> RadioImpl::getCallForwardStatus(int32_t serial, const CallForwardInfo& callInfo) {
- RLOGD("RadioImpl::getCallForwardStatus: serial %d", serial);
+ RLOGD("getCallForwardStatus: serial %d", serial);
dispatchCallForwardStatus(serial, mSlotId, RIL_REQUEST_QUERY_CALL_FORWARD_STATUS,
callInfo);
return Void();
}
Return<void> RadioImpl::setCallForward(int32_t serial, const CallForwardInfo& callInfo) {
- RLOGD("RadioImpl::setCallForward: serial %d", serial);
+ RLOGD("setCallForward: serial %d", serial);
dispatchCallForwardStatus(serial, mSlotId, RIL_REQUEST_SET_CALL_FORWARD,
callInfo);
return Void();
}
Return<void> RadioImpl::getCallWaiting(int32_t serial, int32_t serviceClass) {
- RLOGD("RadioImpl::getCallWaiting: serial %d", serial);
+ RLOGD("getCallWaiting: serial %d", serial);
dispatchInts(serial, mSlotId, RIL_REQUEST_QUERY_CALL_WAITING, 1, serviceClass);
return Void();
}
Return<void> RadioImpl::setCallWaiting(int32_t serial, bool enable, int32_t serviceClass) {
- RLOGD("RadioImpl::setCallWaiting: serial %d", serial);
+ RLOGD("setCallWaiting: serial %d", serial);
dispatchInts(serial, mSlotId, RIL_REQUEST_SET_CALL_WAITING, 2, BOOL_TO_INT(enable),
serviceClass);
return Void();
@@ -1126,21 +1123,21 @@
Return<void> RadioImpl::acknowledgeLastIncomingGsmSms(int32_t serial,
bool success, SmsAcknowledgeFailCause cause) {
- RLOGD("RadioImpl::acknowledgeLastIncomingGsmSms: serial %d", serial);
+ RLOGD("acknowledgeLastIncomingGsmSms: serial %d", serial);
dispatchInts(serial, mSlotId, RIL_REQUEST_SMS_ACKNOWLEDGE, 2, BOOL_TO_INT(success),
cause);
return Void();
}
Return<void> RadioImpl::acceptCall(int32_t serial) {
- RLOGD("RadioImpl::acceptCall: serial %d", serial);
+ RLOGD("acceptCall: serial %d", serial);
dispatchVoid(serial, mSlotId, RIL_REQUEST_ANSWER);
return Void();
}
Return<void> RadioImpl::deactivateDataCall(int32_t serial,
int32_t cid, bool reasonRadioShutDown) {
- RLOGD("RadioImpl::deactivateDataCall: serial %d", serial);
+ RLOGD("deactivateDataCall: serial %d", serial);
dispatchStrings(serial, mSlotId, RIL_REQUEST_DEACTIVATE_DATA_CALL,
2, (const char *) (std::to_string(cid)).c_str(), reasonRadioShutDown ? "1" : "0");
return Void();
@@ -1149,7 +1146,7 @@
Return<void> RadioImpl::getFacilityLockForApp(int32_t serial, const hidl_string& facility,
const hidl_string& password, int32_t serviceClass,
const hidl_string& appId) {
- RLOGD("RadioImpl::getFacilityLockForApp: serial %d", serial);
+ RLOGD("getFacilityLockForApp: serial %d", serial);
dispatchStrings(serial, mSlotId, RIL_REQUEST_QUERY_FACILITY_LOCK,
4, (const char *) facility, (const char *) password,
(const char *) (std::to_string(serviceClass)).c_str(), (const char *) appId);
@@ -1159,7 +1156,7 @@
Return<void> RadioImpl::setFacilityLockForApp(int32_t serial, const hidl_string& facility,
bool lockState, const hidl_string& password,
int32_t serviceClass, const hidl_string& appId) {
- RLOGD("RadioImpl::setFacilityLockForApp: serial %d", serial);
+ RLOGD("setFacilityLockForApp: serial %d", serial);
dispatchStrings(serial, mSlotId, RIL_REQUEST_SET_FACILITY_LOCK,
5, (const char *) facility, lockState ? "1" : "0", (const char *) password,
(const char *) (std::to_string(serviceClass)).c_str(), (const char *) appId);
@@ -1169,103 +1166,96 @@
Return<void> RadioImpl::setBarringPassword(int32_t serial, const hidl_string& facility,
const hidl_string& oldPassword,
const hidl_string& newPassword) {
- RLOGD("RadioImpl::setBarringPassword: serial %d", serial);
+ RLOGD("setBarringPassword: serial %d", serial);
dispatchStrings(serial, mSlotId, RIL_REQUEST_CHANGE_BARRING_PASSWORD,
2, (const char *) oldPassword, (const char *) newPassword);
return Void();
}
Return<void> RadioImpl::getNetworkSelectionMode(int32_t serial) {
- RLOGD("RadioImpl::getNetworkSelectionMode: serial %d", serial);
+ RLOGD("getNetworkSelectionMode: serial %d", serial);
dispatchVoid(serial, mSlotId, RIL_REQUEST_QUERY_NETWORK_SELECTION_MODE);
return Void();
}
Return<void> RadioImpl::setNetworkSelectionModeAutomatic(int32_t serial) {
- RLOGD("RadioImpl::setNetworkSelectionModeAutomatic: serial %d", serial);
+ RLOGD("setNetworkSelectionModeAutomatic: serial %d", serial);
dispatchVoid(serial, mSlotId, RIL_REQUEST_SET_NETWORK_SELECTION_AUTOMATIC);
return Void();
}
Return<void> RadioImpl::setNetworkSelectionModeManual(int32_t serial,
const hidl_string& operatorNumeric) {
- RLOGD("RadioImpl::setNetworkSelectionModeManual: serial %d", serial);
+ RLOGD("setNetworkSelectionModeManual: serial %d", serial);
dispatchString(serial, mSlotId, RIL_REQUEST_SET_NETWORK_SELECTION_MANUAL,
(const char *) operatorNumeric);
return Void();
}
Return<void> RadioImpl::getAvailableNetworks(int32_t serial) {
- RLOGD("RadioImpl::getAvailableNetworks: serial %d", serial);
+ RLOGD("getAvailableNetworks: serial %d", serial);
dispatchVoid(serial, mSlotId, RIL_REQUEST_QUERY_AVAILABLE_NETWORKS);
return Void();
}
Return<void> RadioImpl::startDtmf(int32_t serial, const hidl_string& s) {
- RLOGD("RadioImpl::startDtmf: serial %d", serial);
+ RLOGD("startDtmf: serial %d", serial);
dispatchString(serial, mSlotId, RIL_REQUEST_DTMF_START,
(const char *) s);
return Void();
}
Return<void> RadioImpl::stopDtmf(int32_t serial) {
- RLOGD("RadioImpl::stopDtmf: serial %d", serial);
+ RLOGD("stopDtmf: serial %d", serial);
dispatchVoid(serial, mSlotId, RIL_REQUEST_DTMF_STOP);
return Void();
}
Return<void> RadioImpl::getBasebandVersion(int32_t serial) {
- RLOGD("RadioImpl::getBasebandVersion: serial %d", serial);
+ RLOGD("getBasebandVersion: serial %d", serial);
dispatchVoid(serial, mSlotId, RIL_REQUEST_BASEBAND_VERSION);
return Void();
}
Return<void> RadioImpl::separateConnection(int32_t serial, int32_t gsmIndex) {
- RLOGD("RadioImpl::separateConnection: serial %d", serial);
+ RLOGD("separateConnection: serial %d", serial);
dispatchInts(serial, mSlotId, RIL_REQUEST_SEPARATE_CONNECTION, 1, gsmIndex);
return Void();
}
Return<void> RadioImpl::setMute(int32_t serial, bool enable) {
- RLOGD("RadioImpl::setMute: serial %d", serial);
+ RLOGD("setMute: serial %d", serial);
dispatchInts(serial, mSlotId, RIL_REQUEST_SET_MUTE, 1, BOOL_TO_INT(enable));
return Void();
}
Return<void> RadioImpl::getMute(int32_t serial) {
- RLOGD("RadioImpl::getMute: serial %d", serial);
+ RLOGD("getMute: serial %d", serial);
dispatchVoid(serial, mSlotId, RIL_REQUEST_GET_MUTE);
return Void();
}
Return<void> RadioImpl::getClip(int32_t serial) {
- RLOGD("RadioImpl::getClip: serial %d", serial);
+ RLOGD("getClip: serial %d", serial);
dispatchVoid(serial, mSlotId, RIL_REQUEST_QUERY_CLIP);
return Void();
}
Return<void> RadioImpl::getDataCallList(int32_t serial) {
- RLOGD("RadioImpl::getDataCallList: serial %d", serial);
+ RLOGD("getDataCallList: serial %d", serial);
dispatchVoid(serial, mSlotId, RIL_REQUEST_DATA_CALL_LIST);
return Void();
}
-Return<void> RadioImpl::sendScreenState(int32_t serial, bool enable) {
- // TODO: Completely remove this from HIDL intreface
- RequestInfo *pRI = android::addRequestToList(serial, mSlotId, RIL_REQUEST_SCREEN_STATE);
- sendErrorResponse(pRI, RIL_E_REQUEST_NOT_SUPPORTED);
- return Void();
-}
-
Return<void> RadioImpl::setSuppServiceNotifications(int32_t serial, bool enable) {
- RLOGD("RadioImpl::setSuppServiceNotifications: serial %d", serial);
+ RLOGD("setSuppServiceNotifications: serial %d", serial);
dispatchInts(serial, mSlotId, RIL_REQUEST_SET_SUPP_SVC_NOTIFICATION, 1,
BOOL_TO_INT(enable));
return Void();
}
Return<void> RadioImpl::writeSmsToSim(int32_t serial, const SmsWriteArgs& smsWriteArgs) {
- RLOGD("RadioImpl::writeSmsToSim: serial %d", serial);
+ RLOGD("writeSmsToSim: serial %d", serial);
RequestInfo *pRI = android::addRequestToList(serial, mSlotId, RIL_REQUEST_WRITE_SMS_TO_SIM);
if (pRI == NULL) {
return Void();
@@ -1292,25 +1282,25 @@
}
Return<void> RadioImpl::deleteSmsOnSim(int32_t serial, int32_t index) {
- RLOGD("RadioImpl::deleteSmsOnSim: serial %d", serial);
+ RLOGD("deleteSmsOnSim: serial %d", serial);
dispatchInts(serial, mSlotId, RIL_REQUEST_DELETE_SMS_ON_SIM, 1, index);
return Void();
}
Return<void> RadioImpl::setBandMode(int32_t serial, RadioBandMode mode) {
- RLOGD("RadioImpl::setBandMode: serial %d", serial);
+ RLOGD("setBandMode: serial %d", serial);
dispatchInts(serial, mSlotId, RIL_REQUEST_SET_BAND_MODE, 1, mode);
return Void();
}
Return<void> RadioImpl::getAvailableBandModes(int32_t serial) {
- RLOGD("RadioImpl::getAvailableBandModes: serial %d", serial);
+ RLOGD("getAvailableBandModes: serial %d", serial);
dispatchVoid(serial, mSlotId, RIL_REQUEST_QUERY_AVAILABLE_BAND_MODE);
return Void();
}
Return<void> RadioImpl::sendEnvelope(int32_t serial, const hidl_string& command) {
- RLOGD("RadioImpl::sendEnvelope: serial %d", serial);
+ RLOGD("sendEnvelope: serial %d", serial);
dispatchString(serial, mSlotId, RIL_REQUEST_STK_SEND_ENVELOPE_COMMAND,
(const char *) command);
return Void();
@@ -1318,94 +1308,94 @@
Return<void> RadioImpl::sendTerminalResponseToSim(int32_t serial,
const hidl_string& commandResponse) {
- RLOGD("RadioImpl::sendTerminalResponseToSim: serial %d", serial);
+ RLOGD("sendTerminalResponseToSim: serial %d", serial);
dispatchString(serial, mSlotId, RIL_REQUEST_STK_SEND_TERMINAL_RESPONSE,
(const char *) commandResponse);
return Void();
}
Return<void> RadioImpl::handleStkCallSetupRequestFromSim(int32_t serial, bool accept) {
- RLOGD("RadioImpl::handleStkCallSetupRequestFromSim: serial %d", serial);
+ RLOGD("handleStkCallSetupRequestFromSim: serial %d", serial);
dispatchInts(serial, mSlotId, RIL_REQUEST_STK_HANDLE_CALL_SETUP_REQUESTED_FROM_SIM,
1, BOOL_TO_INT(accept));
return Void();
}
Return<void> RadioImpl::explicitCallTransfer(int32_t serial) {
- RLOGD("RadioImpl::explicitCallTransfer: serial %d", serial);
+ RLOGD("explicitCallTransfer: serial %d", serial);
dispatchVoid(serial, mSlotId, RIL_REQUEST_EXPLICIT_CALL_TRANSFER);
return Void();
}
Return<void> RadioImpl::setPreferredNetworkType(int32_t serial, PreferredNetworkType nwType) {
- RLOGD("RadioImpl::setPreferredNetworkType: serial %d", serial);
+ RLOGD("setPreferredNetworkType: serial %d", serial);
dispatchInts(serial, mSlotId, RIL_REQUEST_SET_PREFERRED_NETWORK_TYPE, 1, nwType);
return Void();
}
Return<void> RadioImpl::getPreferredNetworkType(int32_t serial) {
- RLOGD("RadioImpl::getPreferredNetworkType: serial %d", serial);
+ RLOGD("getPreferredNetworkType: serial %d", serial);
dispatchVoid(serial, mSlotId, RIL_REQUEST_GET_PREFERRED_NETWORK_TYPE);
return Void();
}
Return<void> RadioImpl::getNeighboringCids(int32_t serial) {
- RLOGD("RadioImpl::getNeighboringCids: serial %d", serial);
+ RLOGD("getNeighboringCids: serial %d", serial);
dispatchVoid(serial, mSlotId, RIL_REQUEST_GET_NEIGHBORING_CELL_IDS);
return Void();
}
Return<void> RadioImpl::setLocationUpdates(int32_t serial, bool enable) {
- RLOGD("RadioImpl::setLocationUpdates: serial %d", serial);
+ RLOGD("setLocationUpdates: serial %d", serial);
dispatchInts(serial, mSlotId, RIL_REQUEST_SET_LOCATION_UPDATES, 1, BOOL_TO_INT(enable));
return Void();
}
Return<void> RadioImpl::setCdmaSubscriptionSource(int32_t serial, CdmaSubscriptionSource cdmaSub) {
- RLOGD("RadioImpl::setCdmaSubscriptionSource: serial %d", serial);
+ RLOGD("setCdmaSubscriptionSource: serial %d", serial);
dispatchInts(serial, mSlotId, RIL_REQUEST_CDMA_SET_SUBSCRIPTION_SOURCE, 1, cdmaSub);
return Void();
}
Return<void> RadioImpl::setCdmaRoamingPreference(int32_t serial, CdmaRoamingType type) {
- RLOGD("RadioImpl::setCdmaRoamingPreference: serial %d", serial);
+ RLOGD("setCdmaRoamingPreference: serial %d", serial);
dispatchInts(serial, mSlotId, RIL_REQUEST_CDMA_SET_ROAMING_PREFERENCE, 1, type);
return Void();
}
Return<void> RadioImpl::getCdmaRoamingPreference(int32_t serial) {
- RLOGD("RadioImpl::getCdmaRoamingPreference: serial %d", serial);
+ RLOGD("getCdmaRoamingPreference: serial %d", serial);
dispatchVoid(serial, mSlotId, RIL_REQUEST_CDMA_QUERY_ROAMING_PREFERENCE);
return Void();
}
Return<void> RadioImpl::setTTYMode(int32_t serial, TtyMode mode) {
- RLOGD("RadioImpl::setTTYMode: serial %d", serial);
+ RLOGD("setTTYMode: serial %d", serial);
dispatchInts(serial, mSlotId, RIL_REQUEST_SET_TTY_MODE, 1, mode);
return Void();
}
Return<void> RadioImpl::getTTYMode(int32_t serial) {
- RLOGD("RadioImpl::getTTYMode: serial %d", serial);
+ RLOGD("getTTYMode: serial %d", serial);
dispatchVoid(serial, mSlotId, RIL_REQUEST_QUERY_TTY_MODE);
return Void();
}
Return<void> RadioImpl::setPreferredVoicePrivacy(int32_t serial, bool enable) {
- RLOGD("RadioImpl::setPreferredVoicePrivacy: serial %d", serial);
+ RLOGD("setPreferredVoicePrivacy: serial %d", serial);
dispatchInts(serial, mSlotId, RIL_REQUEST_CDMA_SET_PREFERRED_VOICE_PRIVACY_MODE,
1, BOOL_TO_INT(enable));
return Void();
}
Return<void> RadioImpl::getPreferredVoicePrivacy(int32_t serial) {
- RLOGD("RadioImpl::getPreferredVoicePrivacy: serial %d", serial);
+ RLOGD("getPreferredVoicePrivacy: serial %d", serial);
dispatchVoid(serial, mSlotId, RIL_REQUEST_CDMA_QUERY_PREFERRED_VOICE_PRIVACY_MODE);
return Void();
}
Return<void> RadioImpl::sendCDMAFeatureCode(int32_t serial, const hidl_string& featureCode) {
- RLOGD("RadioImpl::sendCDMAFeatureCode: serial %d", serial);
+ RLOGD("sendCDMAFeatureCode: serial %d", serial);
dispatchString(serial, mSlotId, RIL_REQUEST_CDMA_FLASH,
(const char *) featureCode);
return Void();
@@ -1413,7 +1403,7 @@
Return<void> RadioImpl::sendBurstDtmf(int32_t serial, const hidl_string& dtmf, int32_t on,
int32_t off) {
- RLOGD("RadioImpl::sendBurstDtmf: serial %d", serial);
+ RLOGD("sendBurstDtmf: serial %d", serial);
dispatchStrings(serial, mSlotId, RIL_REQUEST_CDMA_BURST_DTMF,
3, (const char *) dtmf, (const char *) (std::to_string(on)).c_str(),
(const char *) (std::to_string(off)).c_str());
@@ -1454,7 +1444,7 @@
}
Return<void> RadioImpl::sendCdmaSms(int32_t serial, const CdmaSmsMessage& sms) {
- RLOGD("RadioImpl::sendCdmaSms: serial %d", serial);
+ RLOGD("sendCdmaSms: serial %d", serial);
RequestInfo *pRI = android::addRequestToList(serial, mSlotId, RIL_REQUEST_CDMA_SEND_SMS);
if (pRI == NULL) {
return Void();
@@ -1468,7 +1458,7 @@
}
Return<void> RadioImpl::acknowledgeLastIncomingCdmaSms(int32_t serial, const CdmaSmsAck& smsAck) {
- RLOGD("RadioImpl::acknowledgeLastIncomingCdmaSms: serial %d", serial);
+ RLOGD("acknowledgeLastIncomingCdmaSms: serial %d", serial);
RequestInfo *pRI = android::addRequestToList(serial, mSlotId, RIL_REQUEST_CDMA_SMS_ACKNOWLEDGE);
if (pRI == NULL) {
return Void();
@@ -1484,7 +1474,7 @@
}
Return<void> RadioImpl::getGsmBroadcastConfig(int32_t serial) {
- RLOGD("RadioImpl::getGsmBroadcastConfig: serial %d", serial);
+ RLOGD("getGsmBroadcastConfig: serial %d", serial);
dispatchVoid(serial, mSlotId, RIL_REQUEST_GSM_GET_BROADCAST_SMS_CONFIG);
return Void();
}
@@ -1492,7 +1482,7 @@
Return<void> RadioImpl::setGsmBroadcastConfig(int32_t serial,
const hidl_vec<GsmBroadcastSmsConfigInfo>&
configInfo) {
- RLOGD("RadioImpl::setGsmBroadcastConfig: serial %d", serial);
+ RLOGD("setGsmBroadcastConfig: serial %d", serial);
RequestInfo *pRI = android::addRequestToList(serial, mSlotId,
RIL_REQUEST_GSM_SET_BROADCAST_SMS_CONFIG);
if (pRI == NULL) {
@@ -1518,14 +1508,14 @@
}
Return<void> RadioImpl::setGsmBroadcastActivation(int32_t serial, bool activate) {
- RLOGD("RadioImpl::setGsmBroadcastActivation: serial %d", serial);
+ RLOGD("setGsmBroadcastActivation: serial %d", serial);
dispatchInts(serial, mSlotId, RIL_REQUEST_GSM_SMS_BROADCAST_ACTIVATION,
1, BOOL_TO_INT(!activate));
return Void();
}
Return<void> RadioImpl::getCdmaBroadcastConfig(int32_t serial) {
- RLOGD("RadioImpl::getCdmaBroadcastConfig: serial %d", serial);
+ RLOGD("getCdmaBroadcastConfig: serial %d", serial);
dispatchVoid(serial, mSlotId, RIL_REQUEST_CDMA_GET_BROADCAST_SMS_CONFIG);
return Void();
}
@@ -1533,7 +1523,7 @@
Return<void> RadioImpl::setCdmaBroadcastConfig(int32_t serial,
const hidl_vec<CdmaBroadcastSmsConfigInfo>&
configInfo) {
- RLOGD("RadioImpl::setCdmaBroadcastConfig: serial %d", serial);
+ RLOGD("setCdmaBroadcastConfig: serial %d", serial);
RequestInfo *pRI = android::addRequestToList(serial, mSlotId,
RIL_REQUEST_CDMA_SET_BROADCAST_SMS_CONFIG);
if (pRI == NULL) {
@@ -1557,20 +1547,20 @@
}
Return<void> RadioImpl::setCdmaBroadcastActivation(int32_t serial, bool activate) {
- RLOGD("RadioImpl::setCdmaBroadcastActivation: serial %d", serial);
+ RLOGD("setCdmaBroadcastActivation: serial %d", serial);
dispatchInts(serial, mSlotId, RIL_REQUEST_CDMA_SMS_BROADCAST_ACTIVATION,
1, BOOL_TO_INT(!activate));
return Void();
}
Return<void> RadioImpl::getCDMASubscription(int32_t serial) {
- RLOGD("RadioImpl::getCDMASubscription: serial %d", serial);
+ RLOGD("getCDMASubscription: serial %d", serial);
dispatchVoid(serial, mSlotId, RIL_REQUEST_CDMA_SUBSCRIPTION);
return Void();
}
Return<void> RadioImpl::writeSmsToRuim(int32_t serial, const CdmaSmsWriteArgs& cdmaSms) {
- RLOGD("RadioImpl::writeSmsToRuim: serial %d", serial);
+ RLOGD("writeSmsToRuim: serial %d", serial);
RequestInfo *pRI = android::addRequestToList(serial, mSlotId,
RIL_REQUEST_CDMA_WRITE_SMS_TO_RUIM);
if (pRI == NULL) {
@@ -1586,57 +1576,57 @@
}
Return<void> RadioImpl::deleteSmsOnRuim(int32_t serial, int32_t index) {
- RLOGD("RadioImpl::deleteSmsOnRuim: serial %d", serial);
+ RLOGD("deleteSmsOnRuim: serial %d", serial);
dispatchInts(serial, mSlotId, RIL_REQUEST_CDMA_DELETE_SMS_ON_RUIM, 1, index);
return Void();
}
Return<void> RadioImpl::getDeviceIdentity(int32_t serial) {
- RLOGD("RadioImpl::getDeviceIdentity: serial %d", serial);
+ RLOGD("getDeviceIdentity: serial %d", serial);
dispatchVoid(serial, mSlotId, RIL_REQUEST_DEVICE_IDENTITY);
return Void();
}
Return<void> RadioImpl::exitEmergencyCallbackMode(int32_t serial) {
- RLOGD("RadioImpl::exitEmergencyCallbackMode: serial %d", serial);
+ RLOGD("exitEmergencyCallbackMode: serial %d", serial);
dispatchVoid(serial, mSlotId, RIL_REQUEST_EXIT_EMERGENCY_CALLBACK_MODE);
return Void();
}
Return<void> RadioImpl::getSmscAddress(int32_t serial) {
- RLOGD("RadioImpl::getSmscAddress: serial %d", serial);
+ RLOGD("getSmscAddress: serial %d", serial);
dispatchVoid(serial, mSlotId, RIL_REQUEST_GET_SMSC_ADDRESS);
return Void();
}
Return<void> RadioImpl::setSmscAddress(int32_t serial, const hidl_string& smsc) {
- RLOGD("RadioImpl::setSmscAddress: serial %d", serial);
+ RLOGD("setSmscAddress: serial %d", serial);
dispatchString(serial, mSlotId, RIL_REQUEST_SET_SMSC_ADDRESS,
(const char *) smsc);
return Void();
}
Return<void> RadioImpl::reportSmsMemoryStatus(int32_t serial, bool available) {
- RLOGD("RadioImpl::reportSmsMemoryStatus: serial %d", serial);
+ RLOGD("reportSmsMemoryStatus: serial %d", serial);
dispatchInts(serial, mSlotId, RIL_REQUEST_REPORT_SMS_MEMORY_STATUS, 1,
BOOL_TO_INT(available));
return Void();
}
Return<void> RadioImpl::reportStkServiceIsRunning(int32_t serial) {
- RLOGD("RadioImpl::reportStkServiceIsRunning: serial %d", serial);
+ RLOGD("reportStkServiceIsRunning: serial %d", serial);
dispatchVoid(serial, mSlotId, RIL_REQUEST_REPORT_STK_SERVICE_IS_RUNNING);
return Void();
}
Return<void> RadioImpl::getCdmaSubscriptionSource(int32_t serial) {
- RLOGD("RadioImpl::getCdmaSubscriptionSource: serial %d", serial);
+ RLOGD("getCdmaSubscriptionSource: serial %d", serial);
dispatchVoid(serial, mSlotId, RIL_REQUEST_CDMA_GET_SUBSCRIPTION_SOURCE);
return Void();
}
Return<void> RadioImpl::requestIsimAuthentication(int32_t serial, const hidl_string& challenge) {
- RLOGD("RadioImpl::requestIsimAuthentication: serial %d", serial);
+ RLOGD("requestIsimAuthentication: serial %d", serial);
dispatchString(serial, mSlotId, RIL_REQUEST_ISIM_AUTHENTICATION,
(const char *) challenge);
return Void();
@@ -1644,40 +1634,40 @@
Return<void> RadioImpl::acknowledgeIncomingGsmSmsWithPdu(int32_t serial, bool success,
const hidl_string& ackPdu) {
- RLOGD("RadioImpl::acknowledgeIncomingGsmSmsWithPdu: serial %d", serial);
+ RLOGD("acknowledgeIncomingGsmSmsWithPdu: serial %d", serial);
dispatchStrings(serial, mSlotId, RIL_REQUEST_ACKNOWLEDGE_INCOMING_GSM_SMS_WITH_PDU,
2, success ? "1" : "0", (const char *) ackPdu);
return Void();
}
Return<void> RadioImpl::sendEnvelopeWithStatus(int32_t serial, const hidl_string& contents) {
- RLOGD("RadioImpl::sendEnvelopeWithStatus: serial %d", serial);
+ RLOGD("sendEnvelopeWithStatus: serial %d", serial);
dispatchString(serial, mSlotId, RIL_REQUEST_STK_SEND_ENVELOPE_WITH_STATUS,
(const char *) contents);
return Void();
}
Return<void> RadioImpl::getVoiceRadioTechnology(int32_t serial) {
- RLOGD("RadioImpl::getVoiceRadioTechnology: serial %d", serial);
+ RLOGD("getVoiceRadioTechnology: serial %d", serial);
dispatchVoid(serial, mSlotId, RIL_REQUEST_VOICE_RADIO_TECH);
return Void();
}
Return<void> RadioImpl::getCellInfoList(int32_t serial) {
- RLOGD("RadioImpl::getCellInfoList: serial %d", serial);
+ RLOGD("getCellInfoList: serial %d", serial);
dispatchVoid(serial, mSlotId, RIL_REQUEST_GET_CELL_INFO_LIST);
return Void();
}
Return<void> RadioImpl::setCellInfoListRate(int32_t serial, int32_t rate) {
- RLOGD("RadioImpl::setCellInfoListRate: serial %d", serial);
+ RLOGD("setCellInfoListRate: serial %d", serial);
dispatchInts(serial, mSlotId, RIL_REQUEST_SET_UNSOL_CELL_INFO_LIST_RATE, 1, rate);
return Void();
}
Return<void> RadioImpl::setInitialAttachApn(int32_t serial, const DataProfileInfo& dataProfileInfo,
bool modemCognitive, bool isRoaming) {
- RLOGD("RadioImpl::setInitialAttachApn: serial %d", serial);
+ RLOGD("setInitialAttachApn: serial %d", serial);
RequestInfo *pRI = android::addRequestToList(serial, mSlotId,
RIL_REQUEST_SET_INITIAL_ATTACH_APN);
if (pRI == NULL) {
@@ -1753,7 +1743,7 @@
}
Return<void> RadioImpl::getImsRegistrationState(int32_t serial) {
- RLOGD("RadioImpl::getImsRegistrationState: serial %d", serial);
+ RLOGD("getImsRegistrationState: serial %d", serial);
dispatchVoid(serial, mSlotId, RIL_REQUEST_IMS_REGISTRATION_STATE);
return Void();
}
@@ -1839,7 +1829,7 @@
}
Return<void> RadioImpl::sendImsSms(int32_t serial, const ImsSmsMessage& message) {
- RLOGD("RadioImpl::sendImsSms: serial %d", serial);
+ RLOGD("sendImsSms: serial %d", serial);
RequestInfo *pRI = android::addRequestToList(serial, mSlotId, RIL_REQUEST_IMS_SEND_SMS);
if (pRI == NULL) {
return Void();
@@ -1852,7 +1842,7 @@
} else if (RADIO_TECH_3GPP2 == format) {
dispatchImsCdmaSms(message, pRI);
} else {
- RLOGE("RadioImpl::sendImsSms: Invalid radio tech %s",
+ RLOGE("sendImsSms: Invalid radio tech %s",
requestToString(pRI->pCI->requestNumber));
sendErrorResponse(pRI, RIL_E_INVALID_ARGUMENTS);
}
@@ -1860,32 +1850,32 @@
}
Return<void> RadioImpl::iccTransmitApduBasicChannel(int32_t serial, const SimApdu& message) {
- RLOGD("RadioImpl::iccTransmitApduBasicChannel: serial %d", serial);
+ RLOGD("iccTransmitApduBasicChannel: serial %d", serial);
dispatchIccApdu(serial, mSlotId, RIL_REQUEST_SIM_TRANSMIT_APDU_BASIC, message);
return Void();
}
Return<void> RadioImpl::iccOpenLogicalChannel(int32_t serial, const hidl_string& aid) {
- RLOGD("RadioImpl::iccOpenLogicalChannel: serial %d", serial);
+ RLOGD("iccOpenLogicalChannel: serial %d", serial);
dispatchString(serial, mSlotId, RIL_REQUEST_SIM_OPEN_CHANNEL,
(const char *) aid);
return Void();
}
Return<void> RadioImpl::iccCloseLogicalChannel(int32_t serial, int32_t channelId) {
- RLOGD("RadioImpl::iccCloseLogicalChannel: serial %d", serial);
+ RLOGD("iccCloseLogicalChannel: serial %d", serial);
dispatchInts(serial, mSlotId, RIL_REQUEST_SIM_CLOSE_CHANNEL, 1, channelId);
return Void();
}
Return<void> RadioImpl::iccTransmitApduLogicalChannel(int32_t serial, const SimApdu& message) {
- RLOGD("RadioImpl::iccTransmitApduLogicalChannel: serial %d", serial);
+ RLOGD("iccTransmitApduLogicalChannel: serial %d", serial);
dispatchIccApdu(serial, mSlotId, RIL_REQUEST_SIM_TRANSMIT_APDU_CHANNEL, message);
return Void();
}
Return<void> RadioImpl::nvReadItem(int32_t serial, NvItem itemId) {
- RLOGD("RadioImpl::nvReadItem: serial %d", serial);
+ RLOGD("nvReadItem: serial %d", serial);
RequestInfo *pRI = android::addRequestToList(serial, mSlotId, RIL_REQUEST_NV_READ_ITEM);
if (pRI == NULL) {
return Void();
@@ -1900,7 +1890,7 @@
}
Return<void> RadioImpl::nvWriteItem(int32_t serial, const NvWriteItem& item) {
- RLOGD("RadioImpl::nvWriteItem: serial %d", serial);
+ RLOGD("nvWriteItem: serial %d", serial);
RequestInfo *pRI = android::addRequestToList(serial, mSlotId, RIL_REQUEST_NV_WRITE_ITEM);
if (pRI == NULL) {
return Void();
@@ -1922,19 +1912,19 @@
}
Return<void> RadioImpl::nvWriteCdmaPrl(int32_t serial, const hidl_vec<uint8_t>& prl) {
- RLOGD("RadioImpl::nvWriteCdmaPrl: serial %d", serial);
+ RLOGD("nvWriteCdmaPrl: serial %d", serial);
dispatchRaw(serial, mSlotId, RIL_REQUEST_NV_WRITE_CDMA_PRL, prl);
return Void();
}
Return<void> RadioImpl::nvResetConfig(int32_t serial, ResetNvType resetType) {
- RLOGD("RadioImpl::nvResetConfig: serial %d", serial);
+ RLOGD("nvResetConfig: serial %d", serial);
dispatchInts(serial, mSlotId, RIL_REQUEST_NV_RESET_CONFIG, 1, (int) resetType);
return Void();
}
Return<void> RadioImpl::setUiccSubscription(int32_t serial, const SelectUiccSub& uiccSub) {
- RLOGD("RadioImpl::setUiccSubscription: serial %d", serial);
+ RLOGD("setUiccSubscription: serial %d", serial);
RequestInfo *pRI = android::addRequestToList(serial, mSlotId,
RIL_REQUEST_SET_UICC_SUBSCRIPTION);
if (pRI == NULL) {
@@ -1953,20 +1943,20 @@
}
Return<void> RadioImpl::setDataAllowed(int32_t serial, bool allow) {
- RLOGD("RadioImpl::setDataAllowed: serial %d", serial);
+ RLOGD("setDataAllowed: serial %d", serial);
dispatchInts(serial, mSlotId, RIL_REQUEST_ALLOW_DATA, 1, BOOL_TO_INT(allow));
return Void();
}
Return<void> RadioImpl::getHardwareConfig(int32_t serial) {
- RLOGD("RadioImpl::getHardwareConfig: serial %d", serial);
+ RLOGD("getHardwareConfig: serial %d", serial);
dispatchVoid(serial, mSlotId, RIL_REQUEST_GET_HARDWARE_CONFIG);
return Void();
}
Return<void> RadioImpl::requestIccSimAuthentication(int32_t serial, int32_t authContext,
const hidl_string& authData, const hidl_string& aid) {
- RLOGD("RadioImpl::requestIccSimAuthentication: serial %d", serial);
+ RLOGD("requestIccSimAuthentication: serial %d", serial);
RequestInfo *pRI = android::addRequestToList(serial, mSlotId, RIL_REQUEST_SIM_AUTHENTICATION);
if (pRI == NULL) {
return Void();
@@ -2029,7 +2019,7 @@
Return<void> RadioImpl::setDataProfile(int32_t serial, const hidl_vec<DataProfileInfo>& profiles,
bool isRoaming) {
- RLOGD("RadioImpl::setDataProfile: serial %d", serial);
+ RLOGD("setDataProfile: serial %d", serial);
RequestInfo *pRI = android::addRequestToList(serial, mSlotId, RIL_REQUEST_SET_DATA_PROFILE);
if (pRI == NULL) {
return Void();
@@ -2189,19 +2179,19 @@
}
Return<void> RadioImpl::requestShutdown(int32_t serial) {
- RLOGD("RadioImpl::requestShutdown: serial %d", serial);
+ RLOGD("requestShutdown: serial %d", serial);
dispatchVoid(serial, mSlotId, RIL_REQUEST_SHUTDOWN);
return Void();
}
Return<void> RadioImpl::getRadioCapability(int32_t serial) {
- RLOGD("RadioImpl::getRadioCapability: serial %d", serial);
+ RLOGD("getRadioCapability: serial %d", serial);
dispatchVoid(serial, mSlotId, RIL_REQUEST_GET_RADIO_CAPABILITY);
return Void();
}
Return<void> RadioImpl::setRadioCapability(int32_t serial, const RadioCapability& rc) {
- RLOGD("RadioImpl::setRadioCapability: serial %d", serial);
+ RLOGD("setRadioCapability: serial %d", serial);
RequestInfo *pRI = android::addRequestToList(serial, mSlotId, RIL_REQUEST_SET_RADIO_CAPABILITY);
if (pRI == NULL) {
return Void();
@@ -2223,33 +2213,33 @@
}
Return<void> RadioImpl::startLceService(int32_t serial, int32_t reportInterval, bool pullMode) {
- RLOGD("RadioImpl::startLceService: serial %d", serial);
+ RLOGD("startLceService: serial %d", serial);
dispatchInts(serial, mSlotId, RIL_REQUEST_START_LCE, 2, reportInterval,
BOOL_TO_INT(pullMode));
return Void();
}
Return<void> RadioImpl::stopLceService(int32_t serial) {
- RLOGD("RadioImpl::stopLceService: serial %d", serial);
+ RLOGD("stopLceService: serial %d", serial);
dispatchVoid(serial, mSlotId, RIL_REQUEST_STOP_LCE);
return Void();
}
Return<void> RadioImpl::pullLceData(int32_t serial) {
- RLOGD("RadioImpl::pullLceData: serial %d", serial);
+ RLOGD("pullLceData: serial %d", serial);
dispatchVoid(serial, mSlotId, RIL_REQUEST_PULL_LCEDATA);
return Void();
}
Return<void> RadioImpl::getModemActivityInfo(int32_t serial) {
- RLOGD("RadioImpl::getModemActivityInfo: serial %d", serial);
+ RLOGD("getModemActivityInfo: serial %d", serial);
dispatchVoid(serial, mSlotId, RIL_REQUEST_GET_ACTIVITY_INFO);
return Void();
}
Return<void> RadioImpl::setAllowedCarriers(int32_t serial, bool allAllowed,
const CarrierRestrictions& carriers) {
- RLOGD("RadioImpl::setAllowedCarriers: serial %d", serial);
+ RLOGD("setAllowedCarriers: serial %d", serial);
RequestInfo *pRI = android::addRequestToList(serial, mSlotId,
RIL_REQUEST_SET_CARRIER_RESTRICTIONS);
if (pRI == NULL) {
@@ -2263,7 +2253,7 @@
cr.len_allowed_carriers = carriers.allowedCarriers.size();
allowedCarriers = (RIL_Carrier *)calloc(cr.len_allowed_carriers, sizeof(RIL_Carrier));
if (allowedCarriers == NULL) {
- RLOGE("RadioImpl::setAllowedCarriers: Memory allocation failed for request %s",
+ RLOGE("setAllowedCarriers: Memory allocation failed for request %s",
requestToString(pRI->pCI->requestNumber));
sendErrorResponse(pRI, RIL_E_NO_MEMORY);
return Void();
@@ -2273,7 +2263,7 @@
cr.len_excluded_carriers = carriers.excludedCarriers.size();
excludedCarriers = (RIL_Carrier *)calloc(cr.len_excluded_carriers, sizeof(RIL_Carrier));
if (excludedCarriers == NULL) {
- RLOGE("RadioImpl::setAllowedCarriers: Memory allocation failed for request %s",
+ RLOGE("setAllowedCarriers: Memory allocation failed for request %s",
requestToString(pRI->pCI->requestNumber));
sendErrorResponse(pRI, RIL_E_NO_MEMORY);
#ifdef MEMSET_FREED
@@ -2311,17 +2301,17 @@
}
Return<void> RadioImpl::getAllowedCarriers(int32_t serial) {
- RLOGD("RadioImpl::getAllowedCarriers: serial %d", serial);
+ RLOGD("getAllowedCarriers: serial %d", serial);
dispatchVoid(serial, mSlotId, RIL_REQUEST_GET_CARRIER_RESTRICTIONS);
return Void();
}
Return<void> RadioImpl::sendDeviceState(int32_t serial, DeviceStateType deviceStateType,
bool state) {
- RLOGD("RadioImpl::sendDeviceState: serial %d", serial);
+ RLOGD("sendDeviceState: serial %d", serial);
if (s_vendorFunctions->version < 15) {
if (deviceStateType == DeviceStateType::LOW_DATA_EXPECTED) {
- RLOGD("RadioImpl::sendDeviceState: calling screen state %d", BOOL_TO_INT(!state));
+ RLOGD("sendDeviceState: calling screen state %d", BOOL_TO_INT(!state));
dispatchInts(serial, mSlotId, RIL_REQUEST_SCREEN_STATE, 1, BOOL_TO_INT(!state));
} else {
RequestInfo *pRI = android::addRequestToList(serial, mSlotId,
@@ -2336,7 +2326,7 @@
}
Return<void> RadioImpl::setIndicationFilter(int32_t serial, int32_t indicationFilter) {
- RLOGD("RadioImpl::setIndicationFilter: serial %d", serial);
+ RLOGD("setIndicationFilter: serial %d", serial);
if (s_vendorFunctions->version < 15) {
RequestInfo *pRI = android::addRequestToList(serial, mSlotId,
RIL_REQUEST_SET_UNSOLICITED_RESPONSE_FILTER);
@@ -2348,7 +2338,7 @@
}
Return<void> RadioImpl::setSimCardPower(int32_t serial, bool powerUp) {
- RLOGD("RadioImpl::setSimCardPower: serial %d", serial);
+ RLOGD("setSimCardPower: serial %d", serial);
dispatchInts(serial, mSlotId, RIL_REQUEST_SET_SIM_CARD_POWER, 1, BOOL_TO_INT(powerUp));
return Void();
}
@@ -2401,7 +2391,7 @@
Return<void> retStatus = radioService[slotId]->mRadioResponse->acknowledgeRequest(serial);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::acknowledgeRequest: radioService[%d]->mRadioResponse == NULL", slotId);
+ RLOGE("acknowledgeRequest: radioService[%d]->mRadioResponse == NULL", slotId);
}
}
@@ -2434,7 +2424,7 @@
return ret;
}
-int radio::getIccCardStatusResponse(android::Parcel &p, int slotId, int requestNumber,
+int radio::getIccCardStatusResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responseLen) {
if (radioService[slotId]->mRadioResponse != NULL) {
@@ -2442,7 +2432,7 @@
populateResponseInfo(responseInfo, serial, responseType, e);
CardStatus cardStatus = {};
if (response == NULL || responseLen != sizeof(RIL_CardStatus_v6)) {
- RLOGE("radio::getIccCardStatusResponse: Invalid response");
+ RLOGE("getIccCardStatusResponse: Invalid response");
if (e == RIL_E_SUCCESS) responseInfo.error = RadioError::INVALID_RESPONSE;
} else {
RIL_CardStatus_v6 *p_cur = ((RIL_CardStatus_v6 *) response);
@@ -2455,7 +2445,7 @@
RIL_AppStatus *rilAppStatus = p_cur->applications;
cardStatus.applications.resize(p_cur->num_applications);
AppStatus *appStatus = cardStatus.applications.data();
- RLOGD("radio::getIccCardStatusResponse: num_applications %d", p_cur->num_applications);
+ RLOGD("getIccCardStatusResponse: num_applications %d", p_cur->num_applications);
for (int i = 0; i < p_cur->num_applications; i++) {
appStatus[i].appType = (AppType) rilAppStatus[i].app_type;
appStatus[i].appState = (AppState) rilAppStatus[i].app_state;
@@ -2473,16 +2463,16 @@
getIccCardStatusResponse(responseInfo, cardStatus);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::getIccCardStatusResponse: radioService[%d]->mRadioResponse == NULL", slotId);
+ RLOGE("getIccCardStatusResponse: radioService[%d]->mRadioResponse == NULL", slotId);
}
return 0;
}
-int radio::supplyIccPinForAppResponse(android::Parcel &p, int slotId, int requestNumber,
+int radio::supplyIccPinForAppResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responseLen) {
- RLOGD("radio::supplyIccPinForAppResponse: serial %d", serial);
+ RLOGD("supplyIccPinForAppResponse: serial %d", serial);
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
@@ -2491,17 +2481,17 @@
supplyIccPinForAppResponse(responseInfo, ret);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::supplyIccPinForAppResponse: radioService[%d]->mRadioResponse == NULL",
+ RLOGE("supplyIccPinForAppResponse: radioService[%d]->mRadioResponse == NULL",
slotId);
}
return 0;
}
-int radio::supplyIccPukForAppResponse(android::Parcel &p, int slotId, int requestNumber,
+int radio::supplyIccPukForAppResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responseLen) {
- RLOGD("radio::supplyIccPukForAppResponse: serial %d", serial);
+ RLOGD("supplyIccPukForAppResponse: serial %d", serial);
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
@@ -2510,17 +2500,17 @@
responseInfo, ret);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::supplyIccPukForAppResponse: radioService[%d]->mRadioResponse == NULL",
+ RLOGE("supplyIccPukForAppResponse: radioService[%d]->mRadioResponse == NULL",
slotId);
}
return 0;
}
-int radio::supplyIccPin2ForAppResponse(android::Parcel &p, int slotId, int requestNumber,
+int radio::supplyIccPin2ForAppResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responseLen) {
- RLOGD("radio::supplyIccPin2ForAppResponse: serial %d", serial);
+ RLOGD("supplyIccPin2ForAppResponse: serial %d", serial);
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
@@ -2529,17 +2519,17 @@
supplyIccPin2ForAppResponse(responseInfo, ret);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::supplyIccPin2ForAppResponse: radioService[%d]->mRadioResponse == NULL",
+ RLOGE("supplyIccPin2ForAppResponse: radioService[%d]->mRadioResponse == NULL",
slotId);
}
return 0;
}
-int radio::supplyIccPuk2ForAppResponse(android::Parcel &p, int slotId, int requestNumber,
+int radio::supplyIccPuk2ForAppResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responseLen) {
- RLOGD("radio::supplyIccPuk2ForAppResponse: serial %d", serial);
+ RLOGD("supplyIccPuk2ForAppResponse: serial %d", serial);
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
@@ -2548,17 +2538,17 @@
supplyIccPuk2ForAppResponse(responseInfo, ret);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::supplyIccPuk2ForAppResponse: radioService[%d]->mRadioResponse == NULL",
+ RLOGE("supplyIccPuk2ForAppResponse: radioService[%d]->mRadioResponse == NULL",
slotId);
}
return 0;
}
-int radio::changeIccPinForAppResponse(android::Parcel &p, int slotId, int requestNumber,
+int radio::changeIccPinForAppResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responseLen) {
- RLOGD("radio::changeIccPinForAppResponse: serial %d", serial);
+ RLOGD("changeIccPinForAppResponse: serial %d", serial);
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
@@ -2567,17 +2557,17 @@
changeIccPinForAppResponse(responseInfo, ret);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::changeIccPinForAppResponse: radioService[%d]->mRadioResponse == NULL",
+ RLOGE("changeIccPinForAppResponse: radioService[%d]->mRadioResponse == NULL",
slotId);
}
return 0;
}
-int radio::changeIccPin2ForAppResponse(android::Parcel &p, int slotId, int requestNumber,
+int radio::changeIccPin2ForAppResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responseLen) {
- RLOGD("radio::changeIccPin2ForAppResponse: serial %d", serial);
+ RLOGD("changeIccPin2ForAppResponse: serial %d", serial);
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
@@ -2586,17 +2576,17 @@
changeIccPin2ForAppResponse(responseInfo, ret);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::changeIccPin2ForAppResponse: radioService[%d]->mRadioResponse == NULL",
+ RLOGE("changeIccPin2ForAppResponse: radioService[%d]->mRadioResponse == NULL",
slotId);
}
return 0;
}
-int radio::supplyNetworkDepersonalizationResponse(android::Parcel &p, int slotId, int requestNumber,
+int radio::supplyNetworkDepersonalizationResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responseLen) {
- RLOGD("radio::supplyNetworkDepersonalizationResponse: serial %d", serial);
+ RLOGD("supplyNetworkDepersonalizationResponse: serial %d", serial);
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
@@ -2605,17 +2595,17 @@
supplyNetworkDepersonalizationResponse(responseInfo, ret);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::supplyNetworkDepersonalizationResponse: radioService[%d]->mRadioResponse == "
+ RLOGE("supplyNetworkDepersonalizationResponse: radioService[%d]->mRadioResponse == "
"NULL", slotId);
}
return 0;
}
-int radio::getCurrentCallsResponse(android::Parcel &p, int slotId, int requestNumber,
+int radio::getCurrentCallsResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responseLen) {
- RLOGD("radio::getCurrentCallsResponse: serial %d", serial);
+ RLOGD("getCurrentCallsResponse: serial %d", serial);
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
@@ -2623,7 +2613,7 @@
hidl_vec<Call> calls;
if (response == NULL || (responseLen % sizeof(RIL_Call *)) != 0) {
- RLOGE("radio::getCurrentCallsResponse: Invalid response");
+ RLOGE("getCurrentCallsResponse: Invalid response");
if (e == RIL_E_SUCCESS) responseInfo.error = RadioError::INVALID_RESPONSE;
} else {
int num = responseLen / sizeof(RIL_Call *);
@@ -2660,16 +2650,16 @@
getCurrentCallsResponse(responseInfo, calls);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::getCurrentCallsResponse: radioService[%d]->mRadioResponse == NULL", slotId);
+ RLOGE("getCurrentCallsResponse: radioService[%d]->mRadioResponse == NULL", slotId);
}
return 0;
}
-int radio::dialResponse(android::Parcel &p, int slotId, int requestNumber,
+int radio::dialResponse(int slotId,
int responseType, int serial, RIL_Errno e, void *response,
size_t responseLen) {
- RLOGD("radio::dialResponse: serial %d", serial);
+ RLOGD("dialResponse: serial %d", serial);
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
@@ -2677,16 +2667,16 @@
Return<void> retStatus = radioService[slotId]->mRadioResponse->dialResponse(responseInfo);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::dialResponse: radioService[%d]->mRadioResponse == NULL", slotId);
+ RLOGE("dialResponse: radioService[%d]->mRadioResponse == NULL", slotId);
}
return 0;
}
-int radio::getIMSIForAppResponse(android::Parcel &p, int slotId, int requestNumber,
+int radio::getIMSIForAppResponse(int slotId,
int responseType, int serial, RIL_Errno e, void *response,
size_t responseLen) {
- RLOGD("radio::getIMSIForAppResponse: serial %d", serial);
+ RLOGD("getIMSIForAppResponse: serial %d", serial);
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
@@ -2695,17 +2685,17 @@
responseInfo, convertCharPtrToHidlString((char *) response));
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::getIMSIForAppResponse: radioService[%d]->mRadioResponse == NULL",
+ RLOGE("getIMSIForAppResponse: radioService[%d]->mRadioResponse == NULL",
slotId);
}
return 0;
}
-int radio::hangupConnectionResponse(android::Parcel &p, int slotId, int requestNumber,
+int radio::hangupConnectionResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responseLen) {
- RLOGD("radio::hangupConnectionResponse: serial %d", serial);
+ RLOGD("hangupConnectionResponse: serial %d", serial);
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
@@ -2714,17 +2704,17 @@
responseInfo);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::hangupConnectionResponse: radioService[%d]->mRadioResponse == NULL",
+ RLOGE("hangupConnectionResponse: radioService[%d]->mRadioResponse == NULL",
slotId);
}
return 0;
}
-int radio::hangupWaitingOrBackgroundResponse(android::Parcel &p, int slotId, int requestNumber,
+int radio::hangupWaitingOrBackgroundResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responseLen) {
- RLOGD("radio::hangupWaitingOrBackgroundResponse: serial %d", serial);
+ RLOGD("hangupWaitingOrBackgroundResponse: serial %d", serial);
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
@@ -2734,18 +2724,17 @@
responseInfo);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::hangupWaitingOrBackgroundResponse: radioService[%d]->mRadioResponse == NULL",
+ RLOGE("hangupWaitingOrBackgroundResponse: radioService[%d]->mRadioResponse == NULL",
slotId);
}
return 0;
}
-int radio::hangupForegroundResumeBackgroundResponse(android::Parcel &p, int slotId,
- int requestNumber,
- int responseType, int serial, RIL_Errno e,
- void *response, size_t responseLen) {
- RLOGD("radio::hangupWaitingOrBackgroundResponse: serial %d", serial);
+int radio::hangupForegroundResumeBackgroundResponse(int slotId, int responseType, int serial,
+ RIL_Errno e, void *response,
+ size_t responseLen) {
+ RLOGD("hangupWaitingOrBackgroundResponse: serial %d", serial);
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
@@ -2755,18 +2744,17 @@
responseInfo);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::hangupWaitingOrBackgroundResponse: radioService[%d]->mRadioResponse == NULL",
+ RLOGE("hangupWaitingOrBackgroundResponse: radioService[%d]->mRadioResponse == NULL",
slotId);
}
return 0;
}
-int radio::switchWaitingOrHoldingAndActiveResponse(android::Parcel &p, int slotId,
- int requestNumber,
- int responseType, int serial, RIL_Errno e,
- void *response, size_t responseLen) {
- RLOGD("radio::switchWaitingOrHoldingAndActiveResponse: serial %d", serial);
+int radio::switchWaitingOrHoldingAndActiveResponse(int slotId, int responseType, int serial,
+ RIL_Errno e, void *response,
+ size_t responseLen) {
+ RLOGD("switchWaitingOrHoldingAndActiveResponse: serial %d", serial);
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
@@ -2776,16 +2764,16 @@
responseInfo);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::switchWaitingOrHoldingAndActiveResponse: radioService[%d]->mRadioResponse "
+ RLOGE("switchWaitingOrHoldingAndActiveResponse: radioService[%d]->mRadioResponse "
"== NULL", slotId);
}
return 0;
}
-int radio::conferenceResponse(android::Parcel &p, int slotId, int requestNumber, int responseType,
+int radio::conferenceResponse(int slotId, int responseType,
int serial, RIL_Errno e, void *response, size_t responseLen) {
- RLOGD("radio::conferenceResponse: serial %d", serial);
+ RLOGD("conferenceResponse: serial %d", serial);
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
@@ -2794,16 +2782,16 @@
responseInfo);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::conferenceResponse: radioService[%d]->mRadioResponse == NULL",
+ RLOGE("conferenceResponse: radioService[%d]->mRadioResponse == NULL",
slotId);
}
return 0;
}
-int radio::rejectCallResponse(android::Parcel &p, int slotId, int requestNumber, int responseType,
+int radio::rejectCallResponse(int slotId, int responseType,
int serial, RIL_Errno e, void *response, size_t responseLen) {
- RLOGD("radio::rejectCallResponse: serial %d", serial);
+ RLOGD("rejectCallResponse: serial %d", serial);
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
@@ -2812,17 +2800,17 @@
responseInfo);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::rejectCallResponse: radioService[%d]->mRadioResponse == NULL",
+ RLOGE("rejectCallResponse: radioService[%d]->mRadioResponse == NULL",
slotId);
}
return 0;
}
-int radio::getLastCallFailCauseResponse(android::Parcel &p, int slotId, int requestNumber,
+int radio::getLastCallFailCauseResponse(int slotId,
int responseType, int serial, RIL_Errno e, void *response,
size_t responseLen) {
- RLOGD("radio::getLastCallFailCauseResponse: serial %d", serial);
+ RLOGD("getLastCallFailCauseResponse: serial %d", serial);
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
@@ -2831,7 +2819,7 @@
LastCallFailCauseInfo info = {};
info.vendorCause = hidl_string();
if (response == NULL) {
- RLOGE("radio::getCurrentCallsResponse Invalid response: NULL");
+ RLOGE("getCurrentCallsResponse Invalid response: NULL");
if (e == RIL_E_SUCCESS) responseInfo.error = RadioError::INVALID_RESPONSE;
} else if (responseLen == sizeof(int)) {
int *pInt = (int *) response;
@@ -2841,7 +2829,7 @@
info.causeCode = (LastCallFailCause) pFailCauseInfo->cause_code;
info.vendorCause = convertCharPtrToHidlString(pFailCauseInfo->vendor_cause);
} else {
- RLOGE("radio::getCurrentCallsResponse Invalid response: NULL");
+ RLOGE("getCurrentCallsResponse Invalid response: NULL");
if (e == RIL_E_SUCCESS) responseInfo.error = RadioError::INVALID_RESPONSE;
}
@@ -2849,24 +2837,24 @@
responseInfo, info);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::getLastCallFailCauseResponse: radioService[%d]->mRadioResponse == NULL",
+ RLOGE("getLastCallFailCauseResponse: radioService[%d]->mRadioResponse == NULL",
slotId);
}
return 0;
}
-int radio::getSignalStrengthResponse(android::Parcel &p, int slotId, int requestNumber,
+int radio::getSignalStrengthResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responseLen) {
- RLOGD("radio::getSignalStrengthResponse: serial %d", serial);
+ RLOGD("getSignalStrengthResponse: serial %d", serial);
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
populateResponseInfo(responseInfo, serial, responseType, e);
SignalStrength signalStrength = {};
if (response == NULL || responseLen != sizeof(RIL_SignalStrength_v10)) {
- RLOGE("radio::getSignalStrengthResponse: Invalid response");
+ RLOGE("getSignalStrengthResponse: Invalid response");
if (e == RIL_E_SUCCESS) responseInfo.error = RadioError::INVALID_RESPONSE;
} else {
convertRilSignalStrengthToHal(response, responseLen, signalStrength);
@@ -2876,7 +2864,7 @@
responseInfo, signalStrength);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::getSignalStrengthResponse: radioService[%d]->mRadioResponse == NULL",
+ RLOGE("getSignalStrengthResponse: radioService[%d]->mRadioResponse == NULL",
slotId);
}
@@ -3026,7 +3014,7 @@
RIL_CellIdentity_v16 rilCellIdentity;
int32_t *tmp = (int32_t*)&rilCellIdentity;
- for (int i = 0; i < sizeof(RIL_CellIdentity_v16)/sizeof(int32_t); i++) {
+ for (size_t i = 0; i < sizeof(RIL_CellIdentity_v16)/sizeof(int32_t); i++) {
tmp[i] = -1;
}
@@ -3087,7 +3075,7 @@
RIL_CellIdentity_v16 rilCellIdentity;
int32_t *tmp = (int32_t*)&rilCellIdentity;
- for (int i = 0; i < sizeof(RIL_CellIdentity_v16)/sizeof(int32_t); i++) {
+ for (size_t i = 0; i < sizeof(RIL_CellIdentity_v16)/sizeof(int32_t); i++) {
tmp[i] = -1;
}
@@ -3131,10 +3119,10 @@
fillCellIdentityResponse(cellIdentity, rilCellIdentity);
}
-int radio::getVoiceRegistrationStateResponse(android::Parcel &p, int slotId, int requestNumber,
+int radio::getVoiceRegistrationStateResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responseLen) {
- RLOGD("radio::getVoiceRegistrationStateResponse: serial %d", serial);
+ RLOGD("getVoiceRegistrationStateResponse: serial %d", serial);
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
@@ -3143,11 +3131,11 @@
VoiceRegStateResult voiceRegResponse = {};
int numStrings = responseLen / sizeof(char *);
if (response == NULL) {
- RLOGE("radio::getVoiceRegistrationStateResponse Invalid response: NULL");
+ RLOGE("getVoiceRegistrationStateResponse Invalid response: NULL");
if (e == RIL_E_SUCCESS) responseInfo.error = RadioError::INVALID_RESPONSE;
} else if (s_vendorFunctions->version <= 14) {
if (numStrings != 15) {
- RLOGE("radio::getVoiceRegistrationStateResponse Invalid response: NULL");
+ RLOGE("getVoiceRegistrationStateResponse Invalid response: NULL");
if (e == RIL_E_SUCCESS) responseInfo.error = RadioError::INVALID_RESPONSE;
} else {
char **resp = (char **) response;
@@ -3166,7 +3154,7 @@
(RIL_VoiceRegistrationStateResponse *)response;
if (responseLen != sizeof(RIL_VoiceRegistrationStateResponse)) {
- RLOGE("radio::getVoiceRegistrationStateResponse Invalid response: NULL");
+ RLOGE("getVoiceRegistrationStateResponse Invalid response: NULL");
if (e == RIL_E_SUCCESS) responseInfo.error = RadioError::INVALID_RESPONSE;
} else {
voiceRegResponse.regState = (RegState) voiceRegState->regState;
@@ -3186,29 +3174,29 @@
responseInfo, voiceRegResponse);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::getVoiceRegistrationStateResponse: radioService[%d]->mRadioResponse == NULL",
+ RLOGE("getVoiceRegistrationStateResponse: radioService[%d]->mRadioResponse == NULL",
slotId);
}
return 0;
}
-int radio::getDataRegistrationStateResponse(android::Parcel &p, int slotId, int requestNumber,
+int radio::getDataRegistrationStateResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responseLen) {
- RLOGD("radio::getDataRegistrationStateResponse: serial %d", serial);
+ RLOGD("getDataRegistrationStateResponse: serial %d", serial);
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
populateResponseInfo(responseInfo, serial, responseType, e);
DataRegStateResult dataRegResponse = {};
if (response == NULL) {
- RLOGE("radio::getDataRegistrationStateResponse Invalid response: NULL");
+ RLOGE("getDataRegistrationStateResponse Invalid response: NULL");
if (e == RIL_E_SUCCESS) responseInfo.error = RadioError::INVALID_RESPONSE;
} else if (s_vendorFunctions->version <= 14) {
int numStrings = responseLen / sizeof(char *);
if ((numStrings != 6) && (numStrings != 11)) {
- RLOGE("radio::getDataRegistrationStateResponse Invalid response: NULL");
+ RLOGE("getDataRegistrationStateResponse Invalid response: NULL");
if (e == RIL_E_SUCCESS) responseInfo.error = RadioError::INVALID_RESPONSE;
} else {
char **resp = (char **) response;
@@ -3224,7 +3212,7 @@
(RIL_DataRegistrationStateResponse *)response;
if (responseLen != sizeof(RIL_DataRegistrationStateResponse)) {
- RLOGE("radio::getDataRegistrationStateResponse Invalid response: NULL");
+ RLOGE("getDataRegistrationStateResponse Invalid response: NULL");
if (e == RIL_E_SUCCESS) responseInfo.error = RadioError::INVALID_RESPONSE;
} else {
dataRegResponse.regState = (RegState) dataRegState->regState;
@@ -3240,17 +3228,17 @@
dataRegResponse);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::getDataRegistrationStateResponse: radioService[%d]->mRadioResponse == NULL",
+ RLOGE("getDataRegistrationStateResponse: radioService[%d]->mRadioResponse == NULL",
slotId);
}
return 0;
}
-int radio::getOperatorResponse(android::Parcel &p, int slotId, int requestNumber,
+int radio::getOperatorResponse(int slotId,
int responseType, int serial, RIL_Errno e, void *response,
size_t responseLen) {
- RLOGD("radio::getOperatorResponse: serial %d", serial);
+ RLOGD("getOperatorResponse: serial %d", serial);
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
@@ -3260,7 +3248,7 @@
hidl_string numeric;
int numStrings = responseLen / sizeof(char *);
if (response == NULL || numStrings != 3) {
- RLOGE("radio::getOperatorResponse Invalid response: NULL");
+ RLOGE("getOperatorResponse Invalid response: NULL");
if (e == RIL_E_SUCCESS) responseInfo.error = RadioError::INVALID_RESPONSE;
} else {
@@ -3273,17 +3261,17 @@
responseInfo, longName, shortName, numeric);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::getOperatorResponse: radioService[%d]->mRadioResponse == NULL",
+ RLOGE("getOperatorResponse: radioService[%d]->mRadioResponse == NULL",
slotId);
}
return 0;
}
-int radio::setRadioPowerResponse(android::Parcel &p, int slotId, int requestNumber,
+int radio::setRadioPowerResponse(int slotId,
int responseType, int serial, RIL_Errno e, void *response,
size_t responseLen) {
- RLOGD("radio::setRadioPowerResponse: serial %d", serial);
+ RLOGD("setRadioPowerResponse: serial %d", serial);
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
@@ -3292,17 +3280,17 @@
responseInfo);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::setRadioPowerResponse: radioService[%d]->mRadioResponse == NULL",
+ RLOGE("setRadioPowerResponse: radioService[%d]->mRadioResponse == NULL",
slotId);
}
return 0;
}
-int radio::sendDtmfResponse(android::Parcel &p, int slotId, int requestNumber,
+int radio::sendDtmfResponse(int slotId,
int responseType, int serial, RIL_Errno e, void *response,
size_t responseLen) {
- RLOGD("radio::sendDtmfResponse: serial %d", serial);
+ RLOGD("sendDtmfResponse: serial %d", serial);
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
@@ -3311,7 +3299,7 @@
responseInfo);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::sendDtmfResponse: radioService[%d]->mRadioResponse == NULL",
+ RLOGE("sendDtmfResponse: radioService[%d]->mRadioResponse == NULL",
slotId);
}
@@ -3336,10 +3324,10 @@
return result;
}
-int radio::sendSmsResponse(android::Parcel &p, int slotId, int requestNumber,
+int radio::sendSmsResponse(int slotId,
int responseType, int serial, RIL_Errno e, void *response,
size_t responseLen) {
- RLOGD("radio::sendSmsResponse: serial %d", serial);
+ RLOGD("sendSmsResponse: serial %d", serial);
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
@@ -3350,16 +3338,16 @@
result);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::sendSmsResponse: radioService[%d]->mRadioResponse == NULL", slotId);
+ RLOGE("sendSmsResponse: radioService[%d]->mRadioResponse == NULL", slotId);
}
return 0;
}
-int radio::sendSMSExpectMoreResponse(android::Parcel &p, int slotId, int requestNumber,
+int radio::sendSMSExpectMoreResponse(int slotId,
int responseType, int serial, RIL_Errno e, void *response,
size_t responseLen) {
- RLOGD("radio::sendSMSExpectMoreResponse: serial %d", serial);
+ RLOGD("sendSMSExpectMoreResponse: serial %d", serial);
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
@@ -3370,16 +3358,16 @@
responseInfo, result);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::sendSMSExpectMoreResponse: radioService[%d]->mRadioResponse == NULL", slotId);
+ RLOGE("sendSMSExpectMoreResponse: radioService[%d]->mRadioResponse == NULL", slotId);
}
return 0;
}
-int radio::setupDataCallResponse(android::Parcel &p, int slotId, int requestNumber,
+int radio::setupDataCallResponse(int slotId,
int responseType, int serial, RIL_Errno e, void *response,
size_t responseLen) {
- RLOGD("radio::setupDataCallResponse: serial %d", serial);
+ RLOGD("setupDataCallResponse: serial %d", serial);
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
@@ -3387,7 +3375,7 @@
SetupDataCallResult result = {};
if (response == NULL || responseLen != sizeof(RIL_Data_Call_Response_v11)) {
- RLOGE("radio::setupDataCallResponse: Invalid response");
+ RLOGE("setupDataCallResponse: Invalid response");
if (e == RIL_E_SUCCESS) responseInfo.error = RadioError::INVALID_RESPONSE;
result.status = DataCallFailCause::ERROR_UNSPECIFIED;
result.type = hidl_string();
@@ -3404,7 +3392,7 @@
responseInfo, result);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::setupDataCallResponse: radioService[%d]->mRadioResponse == NULL", slotId);
+ RLOGE("setupDataCallResponse: radioService[%d]->mRadioResponse == NULL", slotId);
}
return 0;
@@ -3428,10 +3416,10 @@
return result;
}
-int radio::iccIOForAppResponse(android::Parcel &p, int slotId, int requestNumber,
+int radio::iccIOForAppResponse(int slotId,
int responseType, int serial, RIL_Errno e, void *response,
size_t responseLen) {
- RLOGD("radio::radio::iccIOForAppResponse: serial %d", serial);
+ RLOGD("iccIOForAppResponse: serial %d", serial);
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
@@ -3442,16 +3430,16 @@
responseInfo, result);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::iccIOForAppResponse: radioService[%d]->mRadioResponse == NULL", slotId);
+ RLOGE("iccIOForAppResponse: radioService[%d]->mRadioResponse == NULL", slotId);
}
return 0;
}
-int radio::sendUssdResponse(android::Parcel &p, int slotId, int requestNumber,
+int radio::sendUssdResponse(int slotId,
int responseType, int serial, RIL_Errno e, void *response,
size_t responseLen) {
- RLOGD("radio::sendUssdResponse: serial %d", serial);
+ RLOGD("sendUssdResponse: serial %d", serial);
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
@@ -3460,17 +3448,17 @@
responseInfo);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::sendUssdResponse: radioService[%d]->mRadioResponse == NULL",
+ RLOGE("sendUssdResponse: radioService[%d]->mRadioResponse == NULL",
slotId);
}
return 0;
}
-int radio::cancelPendingUssdResponse(android::Parcel &p, int slotId, int requestNumber,
+int radio::cancelPendingUssdResponse(int slotId,
int responseType, int serial, RIL_Errno e, void *response,
size_t responseLen) {
- RLOGD("radio::cancelPendingUssdResponse: serial %d", serial);
+ RLOGD("cancelPendingUssdResponse: serial %d", serial);
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
@@ -3479,17 +3467,17 @@
responseInfo);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::cancelPendingUssdResponse: radioService[%d]->mRadioResponse == NULL",
+ RLOGE("cancelPendingUssdResponse: radioService[%d]->mRadioResponse == NULL",
slotId);
}
return 0;
}
-int radio::getClirResponse(android::Parcel &p, int slotId, int requestNumber,
+int radio::getClirResponse(int slotId,
int responseType, int serial, RIL_Errno e, void *response,
size_t responseLen) {
- RLOGD("radio::getClirResponse: serial %d", serial);
+ RLOGD("getClirResponse: serial %d", serial);
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
@@ -3497,7 +3485,7 @@
int n = -1, m = -1;
int numInts = responseLen / sizeof(int);
if (response == NULL || numInts != 2) {
- RLOGE("radio::getClirResponse Invalid response: NULL");
+ RLOGE("getClirResponse Invalid response: NULL");
if (e == RIL_E_SUCCESS) responseInfo.error = RadioError::INVALID_RESPONSE;
} else {
int *pInt = (int *) response;
@@ -3508,16 +3496,16 @@
n, m);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::getClirResponse: radioService[%d]->mRadioResponse == NULL", slotId);
+ RLOGE("getClirResponse: radioService[%d]->mRadioResponse == NULL", slotId);
}
return 0;
}
-int radio::setClirResponse(android::Parcel &p, int slotId, int requestNumber,
+int radio::setClirResponse(int slotId,
int responseType, int serial, RIL_Errno e, void *response,
size_t responseLen) {
- RLOGD("radio::setClirResponse: serial %d", serial);
+ RLOGD("setClirResponse: serial %d", serial);
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
@@ -3526,16 +3514,16 @@
responseInfo);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::setClirResponse: radioService[%d]->mRadioResponse == NULL", slotId);
+ RLOGE("setClirResponse: radioService[%d]->mRadioResponse == NULL", slotId);
}
return 0;
}
-int radio::getCallForwardStatusResponse(android::Parcel &p, int slotId, int requestNumber,
+int radio::getCallForwardStatusResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responseLen) {
- RLOGD("radio::getCallForwardStatusResponse: serial %d", serial);
+ RLOGD("getCallForwardStatusResponse: serial %d", serial);
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
@@ -3543,7 +3531,7 @@
hidl_vec<CallForwardInfo> callForwardInfos;
if (response == NULL || responseLen % sizeof(RIL_CallForwardInfo *) != 0) {
- RLOGE("radio::getCallForwardStatusResponse Invalid response: NULL");
+ RLOGE("getCallForwardStatusResponse Invalid response: NULL");
if (e == RIL_E_SUCCESS) responseInfo.error = RadioError::INVALID_RESPONSE;
} else {
int num = responseLen / sizeof(RIL_CallForwardInfo *);
@@ -3563,17 +3551,17 @@
responseInfo, callForwardInfos);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::getCallForwardStatusResponse: radioService[%d]->mRadioResponse == NULL",
+ RLOGE("getCallForwardStatusResponse: radioService[%d]->mRadioResponse == NULL",
slotId);
}
return 0;
}
-int radio::setCallForwardResponse(android::Parcel &p, int slotId, int requestNumber,
+int radio::setCallForwardResponse(int slotId,
int responseType, int serial, RIL_Errno e, void *response,
size_t responseLen) {
- RLOGD("radio::setCallForwardResponse: serial %d", serial);
+ RLOGD("setCallForwardResponse: serial %d", serial);
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
@@ -3582,16 +3570,16 @@
responseInfo);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::setCallForwardResponse: radioService[%d]->mRadioResponse == NULL", slotId);
+ RLOGE("setCallForwardResponse: radioService[%d]->mRadioResponse == NULL", slotId);
}
return 0;
}
-int radio::getCallWaitingResponse(android::Parcel &p, int slotId, int requestNumber,
+int radio::getCallWaitingResponse(int slotId,
int responseType, int serial, RIL_Errno e, void *response,
size_t responseLen) {
- RLOGD("radio::getCallWaitingResponse: serial %d", serial);
+ RLOGD("getCallWaitingResponse: serial %d", serial);
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
@@ -3600,7 +3588,7 @@
int serviceClass = -1;
int numInts = responseLen / sizeof(int);
if (response == NULL || numInts != 2) {
- RLOGE("radio::getCallWaitingResponse Invalid response: NULL");
+ RLOGE("getCallWaitingResponse Invalid response: NULL");
if (e == RIL_E_SUCCESS) responseInfo.error = RadioError::INVALID_RESPONSE;
} else {
int *pInt = (int *) response;
@@ -3611,16 +3599,16 @@
responseInfo, enable, serviceClass);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::getCallWaitingResponse: radioService[%d]->mRadioResponse == NULL", slotId);
+ RLOGE("getCallWaitingResponse: radioService[%d]->mRadioResponse == NULL", slotId);
}
return 0;
}
-int radio::setCallWaitingResponse(android::Parcel &p, int slotId, int requestNumber,
+int radio::setCallWaitingResponse(int slotId,
int responseType, int serial, RIL_Errno e, void *response,
size_t responseLen) {
- RLOGD("radio::setCallWaitingResponse: serial %d", serial);
+ RLOGD("setCallWaitingResponse: serial %d", serial);
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
@@ -3629,16 +3617,16 @@
responseInfo);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::setCallWaitingResponse: radioService[%d]->mRadioResponse == NULL", slotId);
+ RLOGE("setCallWaitingResponse: radioService[%d]->mRadioResponse == NULL", slotId);
}
return 0;
}
-int radio::acknowledgeLastIncomingGsmSmsResponse(android::Parcel &p, int slotId, int requestNumber,
+int radio::acknowledgeLastIncomingGsmSmsResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responseLen) {
- RLOGD("radio::acknowledgeLastIncomingGsmSmsResponse: serial %d", serial);
+ RLOGD("acknowledgeLastIncomingGsmSmsResponse: serial %d", serial);
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
@@ -3648,17 +3636,17 @@
responseInfo);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::acknowledgeLastIncomingGsmSmsResponse: radioService[%d]->mRadioResponse "
+ RLOGE("acknowledgeLastIncomingGsmSmsResponse: radioService[%d]->mRadioResponse "
"== NULL", slotId);
}
return 0;
}
-int radio::acceptCallResponse(android::Parcel &p, int slotId, int requestNumber,
+int radio::acceptCallResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responseLen) {
- RLOGD("radio::acceptCallResponse: serial %d", serial);
+ RLOGD("acceptCallResponse: serial %d", serial);
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
@@ -3667,17 +3655,17 @@
responseInfo);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::acceptCallResponse: radioService[%d]->mRadioResponse == NULL",
+ RLOGE("acceptCallResponse: radioService[%d]->mRadioResponse == NULL",
slotId);
}
return 0;
}
-int radio::deactivateDataCallResponse(android::Parcel &p, int slotId, int requestNumber,
+int radio::deactivateDataCallResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responseLen) {
- RLOGD("radio::deactivateDataCallResponse: serial %d", serial);
+ RLOGD("deactivateDataCallResponse: serial %d", serial);
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
@@ -3686,17 +3674,17 @@
responseInfo);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::deactivateDataCallResponse: radioService[%d]->mRadioResponse == NULL",
+ RLOGE("deactivateDataCallResponse: radioService[%d]->mRadioResponse == NULL",
slotId);
}
return 0;
}
-int radio::getFacilityLockForAppResponse(android::Parcel &p, int slotId, int requestNumber,
+int radio::getFacilityLockForAppResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responseLen) {
- RLOGD("radio::getFacilityLockForAppResponse: serial %d", serial);
+ RLOGD("getFacilityLockForAppResponse: serial %d", serial);
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
@@ -3705,17 +3693,17 @@
getFacilityLockForAppResponse(responseInfo, ret);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::getFacilityLockForAppResponse: radioService[%d]->mRadioResponse == NULL",
+ RLOGE("getFacilityLockForAppResponse: radioService[%d]->mRadioResponse == NULL",
slotId);
}
return 0;
}
-int radio::setFacilityLockForAppResponse(android::Parcel &p, int slotId, int requestNumber,
+int radio::setFacilityLockForAppResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responseLen) {
- RLOGD("radio::setFacilityLockForAppResponse: serial %d", serial);
+ RLOGD("setFacilityLockForAppResponse: serial %d", serial);
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
@@ -3725,17 +3713,17 @@
ret);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::setFacilityLockForAppResponse: radioService[%d]->mRadioResponse == NULL",
+ RLOGE("setFacilityLockForAppResponse: radioService[%d]->mRadioResponse == NULL",
slotId);
}
return 0;
}
-int radio::setBarringPasswordResponse(android::Parcel &p, int slotId, int requestNumber,
+int radio::setBarringPasswordResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responseLen) {
- RLOGD("radio::acceptCallResponse: serial %d", serial);
+ RLOGD("acceptCallResponse: serial %d", serial);
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
@@ -3744,17 +3732,17 @@
= radioService[slotId]->mRadioResponse->setBarringPasswordResponse(responseInfo);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::setBarringPasswordResponse: radioService[%d]->mRadioResponse == NULL",
+ RLOGE("setBarringPasswordResponse: radioService[%d]->mRadioResponse == NULL",
slotId);
}
return 0;
}
-int radio::getNetworkSelectionModeResponse(android::Parcel &p, int slotId, int requestNumber,
+int radio::getNetworkSelectionModeResponse(int slotId,
int responseType, int serial, RIL_Errno e, void *response,
size_t responseLen) {
- RLOGD("radio::getNetworkSelectionModeResponse: serial %d", serial);
+ RLOGD("getNetworkSelectionModeResponse: serial %d", serial);
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
@@ -3762,7 +3750,7 @@
bool manual = false;
int serviceClass;
if (response == NULL || responseLen != sizeof(int)) {
- RLOGE("radio::getNetworkSelectionModeResponse Invalid response: NULL");
+ RLOGE("getNetworkSelectionModeResponse Invalid response: NULL");
if (e == RIL_E_SUCCESS) responseInfo.error = RadioError::INVALID_RESPONSE;
} else {
int *pInt = (int *) response;
@@ -3774,18 +3762,17 @@
manual);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::getNetworkSelectionModeResponse: radioService[%d]->mRadioResponse == NULL",
+ RLOGE("getNetworkSelectionModeResponse: radioService[%d]->mRadioResponse == NULL",
slotId);
}
return 0;
}
-int radio::setNetworkSelectionModeAutomaticResponse(android::Parcel &p, int slotId,
- int requestNumber,
- int responseType, int serial, RIL_Errno e,
- void *response, size_t responseLen) {
- RLOGD("radio::setNetworkSelectionModeAutomaticResponse: serial %d", serial);
+int radio::setNetworkSelectionModeAutomaticResponse(int slotId, int responseType, int serial,
+ RIL_Errno e, void *response,
+ size_t responseLen) {
+ RLOGD("setNetworkSelectionModeAutomaticResponse: serial %d", serial);
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
@@ -3795,17 +3782,17 @@
responseInfo);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::setNetworkSelectionModeAutomaticResponse: radioService[%d]->mRadioResponse "
+ RLOGE("setNetworkSelectionModeAutomaticResponse: radioService[%d]->mRadioResponse "
"== NULL", slotId);
}
return 0;
}
-int radio::setNetworkSelectionModeManualResponse(android::Parcel &p, int slotId, int requestNumber,
+int radio::setNetworkSelectionModeManualResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responseLen) {
- RLOGD("radio::setNetworkSelectionModeManualResponse: serial %d", serial);
+ RLOGD("setNetworkSelectionModeManualResponse: serial %d", serial);
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
@@ -3815,7 +3802,7 @@
responseInfo);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::acceptCallResponse: radioService[%d]->setNetworkSelectionModeManualResponse "
+ RLOGE("acceptCallResponse: radioService[%d]->setNetworkSelectionModeManualResponse "
"== NULL", slotId);
}
@@ -3836,17 +3823,17 @@
}
}
-int radio::getAvailableNetworksResponse(android::Parcel &p, int slotId, int requestNumber,
+int radio::getAvailableNetworksResponse(int slotId,
int responseType, int serial, RIL_Errno e, void *response,
size_t responseLen) {
- RLOGD("radio::getAvailableNetworksResponse: serial %d", serial);
+ RLOGD("getAvailableNetworksResponse: serial %d", serial);
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
populateResponseInfo(responseInfo, serial, responseType, e);
hidl_vec<OperatorInfo> networks;
if (response == NULL || responseLen % (4 * sizeof(char *))!= 0) {
- RLOGE("radio::getAvailableNetworksResponse Invalid response: NULL");
+ RLOGE("getAvailableNetworksResponse Invalid response: NULL");
if (e == RIL_E_SUCCESS) responseInfo.error = RadioError::INVALID_RESPONSE;
} else {
char **resp = (char **) response;
@@ -3869,17 +3856,17 @@
networks);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::getAvailableNetworksResponse: radioService[%d]->mRadioResponse == NULL",
+ RLOGE("getAvailableNetworksResponse: radioService[%d]->mRadioResponse == NULL",
slotId);
}
return 0;
}
-int radio::startDtmfResponse(android::Parcel &p, int slotId, int requestNumber,
+int radio::startDtmfResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responseLen) {
- RLOGD("radio::startDtmfResponse: serial %d", serial);
+ RLOGD("startDtmfResponse: serial %d", serial);
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
@@ -3888,16 +3875,16 @@
= radioService[slotId]->mRadioResponse->startDtmfResponse(responseInfo);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::startDtmfResponse: radioService[%d]->mRadioResponse == NULL", slotId);
+ RLOGE("startDtmfResponse: radioService[%d]->mRadioResponse == NULL", slotId);
}
return 0;
}
-int radio::stopDtmfResponse(android::Parcel &p, int slotId, int requestNumber,
+int radio::stopDtmfResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responseLen) {
- RLOGD("radio::stopDtmfResponse: serial %d", serial);
+ RLOGD("stopDtmfResponse: serial %d", serial);
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
@@ -3906,16 +3893,16 @@
= radioService[slotId]->mRadioResponse->stopDtmfResponse(responseInfo);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::stopDtmfResponse: radioService[%d]->mRadioResponse == NULL", slotId);
+ RLOGE("stopDtmfResponse: radioService[%d]->mRadioResponse == NULL", slotId);
}
return 0;
}
-int radio::getBasebandVersionResponse(android::Parcel &p, int slotId, int requestNumber,
+int radio::getBasebandVersionResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responseLen) {
- RLOGD("radio::getBasebandVersionResponse: serial %d", serial);
+ RLOGD("getBasebandVersionResponse: serial %d", serial);
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
@@ -3925,16 +3912,16 @@
convertCharPtrToHidlString((char *) response));
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::getBasebandVersionResponse: radioService[%d]->mRadioResponse == NULL", slotId);
+ RLOGE("getBasebandVersionResponse: radioService[%d]->mRadioResponse == NULL", slotId);
}
return 0;
}
-int radio::separateConnectionResponse(android::Parcel &p, int slotId, int requestNumber,
+int radio::separateConnectionResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responseLen) {
- RLOGD("radio::separateConnectionResponse: serial %d", serial);
+ RLOGD("separateConnectionResponse: serial %d", serial);
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
@@ -3943,17 +3930,17 @@
= radioService[slotId]->mRadioResponse->separateConnectionResponse(responseInfo);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::separateConnectionResponse: radioService[%d]->mRadioResponse == NULL",
+ RLOGE("separateConnectionResponse: radioService[%d]->mRadioResponse == NULL",
slotId);
}
return 0;
}
-int radio::setMuteResponse(android::Parcel &p, int slotId, int requestNumber,
+int radio::setMuteResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responseLen) {
- RLOGD("radio::setMuteResponse: serial %d", serial);
+ RLOGD("setMuteResponse: serial %d", serial);
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
@@ -3962,16 +3949,16 @@
= radioService[slotId]->mRadioResponse->setMuteResponse(responseInfo);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::setMuteResponse: radioService[%d]->mRadioResponse == NULL", slotId);
+ RLOGE("setMuteResponse: radioService[%d]->mRadioResponse == NULL", slotId);
}
return 0;
}
-int radio::getMuteResponse(android::Parcel &p, int slotId, int requestNumber,
+int radio::getMuteResponse(int slotId,
int responseType, int serial, RIL_Errno e, void *response,
size_t responseLen) {
- RLOGD("radio::getMuteResponse: serial %d", serial);
+ RLOGD("getMuteResponse: serial %d", serial);
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
@@ -3979,7 +3966,7 @@
bool enable = false;
int serviceClass;
if (response == NULL || responseLen != sizeof(int)) {
- RLOGE("radio::getMuteResponse Invalid response: NULL");
+ RLOGE("getMuteResponse Invalid response: NULL");
if (e == RIL_E_SUCCESS) responseInfo.error = RadioError::INVALID_RESPONSE;
} else {
int *pInt = (int *) response;
@@ -3989,16 +3976,16 @@
enable);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::getMuteResponse: radioService[%d]->mRadioResponse == NULL", slotId);
+ RLOGE("getMuteResponse: radioService[%d]->mRadioResponse == NULL", slotId);
}
return 0;
}
-int radio::getClipResponse(android::Parcel &p, int slotId, int requestNumber,
+int radio::getClipResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responseLen) {
- RLOGD("radio::getClipResponse: serial %d", serial);
+ RLOGD("getClipResponse: serial %d", serial);
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
@@ -4007,16 +3994,16 @@
(ClipStatus) ret);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::getClipResponse: radioService[%d]->mRadioResponse == NULL", slotId);
+ RLOGE("getClipResponse: radioService[%d]->mRadioResponse == NULL", slotId);
}
return 0;
}
-int radio::getDataCallListResponse(android::Parcel &p, int slotId, int requestNumber,
+int radio::getDataCallListResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responseLen) {
- RLOGD("radio::getDataCallListResponse: serial %d", serial);
+ RLOGD("getDataCallListResponse: serial %d", serial);
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
@@ -4024,7 +4011,7 @@
hidl_vec<SetupDataCallResult> ret;
if (response == NULL || responseLen % sizeof(RIL_Data_Call_Response_v11) != 0) {
- RLOGE("radio::getDataCallListResponse: invalid response");
+ RLOGE("getDataCallListResponse: invalid response");
if (e == RIL_E_SUCCESS) responseInfo.error = RadioError::INVALID_RESPONSE;
} else {
convertRilDataCallListToHal(response, responseLen, ret);
@@ -4034,16 +4021,16 @@
responseInfo, ret);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::getDataCallListResponse: radioService[%d]->mRadioResponse == NULL", slotId);
+ RLOGE("getDataCallListResponse: radioService[%d]->mRadioResponse == NULL", slotId);
}
return 0;
}
-int radio::setSuppServiceNotificationsResponse(android::Parcel &p, int slotId, int requestNumber,
+int radio::setSuppServiceNotificationsResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responseLen) {
- RLOGD("radio::setSuppServiceNotificationsResponse: serial %d", serial);
+ RLOGD("setSuppServiceNotificationsResponse: serial %d", serial);
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
@@ -4053,17 +4040,17 @@
responseInfo);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::setSuppServiceNotificationsResponse: radioService[%d]->mRadioResponse "
+ RLOGE("setSuppServiceNotificationsResponse: radioService[%d]->mRadioResponse "
"== NULL", slotId);
}
return 0;
}
-int radio::deleteSmsOnSimResponse(android::Parcel &p, int slotId, int requestNumber,
+int radio::deleteSmsOnSimResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responseLen) {
- RLOGD("radio::deleteSmsOnSimResponse: serial %d", serial);
+ RLOGD("deleteSmsOnSimResponse: serial %d", serial);
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
@@ -4072,16 +4059,16 @@
= radioService[slotId]->mRadioResponse->deleteSmsOnSimResponse(responseInfo);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::deleteSmsOnSimResponse: radioService[%d]->mRadioResponse == NULL", slotId);
+ RLOGE("deleteSmsOnSimResponse: radioService[%d]->mRadioResponse == NULL", slotId);
}
return 0;
}
-int radio::setBandModeResponse(android::Parcel &p, int slotId, int requestNumber,
+int radio::setBandModeResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responseLen) {
- RLOGD("radio::setBandModeResponse: serial %d", serial);
+ RLOGD("setBandModeResponse: serial %d", serial);
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
@@ -4090,16 +4077,16 @@
= radioService[slotId]->mRadioResponse->setBandModeResponse(responseInfo);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::setBandModeResponse: radioService[%d]->mRadioResponse == NULL", slotId);
+ RLOGE("setBandModeResponse: radioService[%d]->mRadioResponse == NULL", slotId);
}
return 0;
}
-int radio::writeSmsToSimResponse(android::Parcel &p, int slotId, int requestNumber,
+int radio::writeSmsToSimResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responseLen) {
- RLOGD("radio::writeSmsToSimResponse: serial %d", serial);
+ RLOGD("writeSmsToSimResponse: serial %d", serial);
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
@@ -4108,23 +4095,23 @@
= radioService[slotId]->mRadioResponse->writeSmsToSimResponse(responseInfo, ret);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::writeSmsToSimResponse: radioService[%d]->mRadioResponse == NULL", slotId);
+ RLOGE("writeSmsToSimResponse: radioService[%d]->mRadioResponse == NULL", slotId);
}
return 0;
}
-int radio::getAvailableBandModesResponse(android::Parcel &p, int slotId, int requestNumber,
+int radio::getAvailableBandModesResponse(int slotId,
int responseType, int serial, RIL_Errno e, void *response,
size_t responseLen) {
- RLOGD("radio::getAvailableBandModesResponse: serial %d", serial);
+ RLOGD("getAvailableBandModesResponse: serial %d", serial);
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
populateResponseInfo(responseInfo, serial, responseType, e);
hidl_vec<RadioBandMode> modes;
if (response == NULL || responseLen % sizeof(int) != 0) {
- RLOGE("radio::getAvailableBandModesResponse Invalid response: NULL");
+ RLOGE("getAvailableBandModesResponse Invalid response: NULL");
if (e == RIL_E_SUCCESS) responseInfo.error = RadioError::INVALID_RESPONSE;
} else {
int *pInt = (int *) response;
@@ -4139,17 +4126,17 @@
modes);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::getAvailableBandModesResponse: radioService[%d]->mRadioResponse == NULL",
+ RLOGE("getAvailableBandModesResponse: radioService[%d]->mRadioResponse == NULL",
slotId);
}
return 0;
}
-int radio::sendEnvelopeResponse(android::Parcel &p, int slotId, int requestNumber,
+int radio::sendEnvelopeResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responseLen) {
- RLOGD("radio::sendEnvelopeResponse: serial %d", serial);
+ RLOGD("sendEnvelopeResponse: serial %d", serial);
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
@@ -4159,16 +4146,16 @@
convertCharPtrToHidlString((char *) response));
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::sendEnvelopeResponse: radioService[%d]->mRadioResponse == NULL", slotId);
+ RLOGE("sendEnvelopeResponse: radioService[%d]->mRadioResponse == NULL", slotId);
}
return 0;
}
-int radio::sendTerminalResponseToSimResponse(android::Parcel &p, int slotId, int requestNumber,
+int radio::sendTerminalResponseToSimResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responseLen) {
- RLOGD("radio::sendTerminalResponseToSimResponse: serial %d", serial);
+ RLOGD("sendTerminalResponseToSimResponse: serial %d", serial);
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
@@ -4178,18 +4165,18 @@
responseInfo);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::sendTerminalResponseToSimResponse: radioService[%d]->mRadioResponse == NULL",
+ RLOGE("sendTerminalResponseToSimResponse: radioService[%d]->mRadioResponse == NULL",
slotId);
}
return 0;
}
-int radio::handleStkCallSetupRequestFromSimResponse(android::Parcel &p, int slotId,
- int requestNumber, int responseType, int serial,
+int radio::handleStkCallSetupRequestFromSimResponse(int slotId,
+ int responseType, int serial,
RIL_Errno e, void *response,
size_t responseLen) {
- RLOGD("radio::handleStkCallSetupRequestFromSimResponse: serial %d", serial);
+ RLOGD("handleStkCallSetupRequestFromSimResponse: serial %d", serial);
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
@@ -4199,17 +4186,17 @@
responseInfo);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::handleStkCallSetupRequestFromSimResponse: radioService[%d]->mRadioResponse "
+ RLOGE("handleStkCallSetupRequestFromSimResponse: radioService[%d]->mRadioResponse "
"== NULL", slotId);
}
return 0;
}
-int radio::explicitCallTransferResponse(android::Parcel &p, int slotId, int requestNumber,
+int radio::explicitCallTransferResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responseLen) {
- RLOGD("radio::explicitCallTransferResponse: serial %d", serial);
+ RLOGD("explicitCallTransferResponse: serial %d", serial);
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
@@ -4218,17 +4205,17 @@
= radioService[slotId]->mRadioResponse->explicitCallTransferResponse(responseInfo);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::explicitCallTransferResponse: radioService[%d]->mRadioResponse == NULL",
+ RLOGE("explicitCallTransferResponse: radioService[%d]->mRadioResponse == NULL",
slotId);
}
return 0;
}
-int radio::setPreferredNetworkTypeResponse(android::Parcel &p, int slotId, int requestNumber,
+int radio::setPreferredNetworkTypeResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responseLen) {
- RLOGD("radio::setPreferredNetworkTypeResponse: serial %d", serial);
+ RLOGD("setPreferredNetworkTypeResponse: serial %d", serial);
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
@@ -4238,7 +4225,7 @@
responseInfo);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::setPreferredNetworkTypeResponse: radioService[%d]->mRadioResponse == NULL",
+ RLOGE("setPreferredNetworkTypeResponse: radioService[%d]->mRadioResponse == NULL",
slotId);
}
@@ -4246,10 +4233,10 @@
}
-int radio::getPreferredNetworkTypeResponse(android::Parcel &p, int slotId, int requestNumber,
+int radio::getPreferredNetworkTypeResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responseLen) {
- RLOGD("radio::getPreferredNetworkTypeResponse: serial %d", serial);
+ RLOGD("getPreferredNetworkTypeResponse: serial %d", serial);
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
@@ -4259,17 +4246,17 @@
responseInfo, (PreferredNetworkType) ret);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::getPreferredNetworkTypeResponse: radioService[%d]->mRadioResponse == NULL",
+ RLOGE("getPreferredNetworkTypeResponse: radioService[%d]->mRadioResponse == NULL",
slotId);
}
return 0;
}
-int radio::getNeighboringCidsResponse(android::Parcel &p, int slotId, int requestNumber,
+int radio::getNeighboringCidsResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responseLen) {
- RLOGD("radio::getNeighboringCidsResponse: serial %d", serial);
+ RLOGD("getNeighboringCidsResponse: serial %d", serial);
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
@@ -4277,7 +4264,7 @@
hidl_vec<NeighboringCell> cells;
if (response == NULL || responseLen % sizeof(RIL_NeighboringCell *) != 0) {
- RLOGE("radio::getNeighboringCidsResponse Invalid response: NULL");
+ RLOGE("getNeighboringCidsResponse Invalid response: NULL");
if (e == RIL_E_SUCCESS) responseInfo.error = RadioError::INVALID_RESPONSE;
} else {
int num = responseLen / sizeof(RIL_NeighboringCell *);
@@ -4294,17 +4281,17 @@
cells);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::getNeighboringCidsResponse: radioService[%d]->mRadioResponse == NULL",
+ RLOGE("getNeighboringCidsResponse: radioService[%d]->mRadioResponse == NULL",
slotId);
}
return 0;
}
-int radio::setLocationUpdatesResponse(android::Parcel &p, int slotId, int requestNumber,
+int radio::setLocationUpdatesResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responseLen) {
- RLOGD("radio::setLocationUpdatesResponse: serial %d", serial);
+ RLOGD("setLocationUpdatesResponse: serial %d", serial);
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
@@ -4313,17 +4300,17 @@
= radioService[slotId]->mRadioResponse->setLocationUpdatesResponse(responseInfo);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::setLocationUpdatesResponse: radioService[%d]->mRadioResponse == NULL",
+ RLOGE("setLocationUpdatesResponse: radioService[%d]->mRadioResponse == NULL",
slotId);
}
return 0;
}
-int radio::setCdmaSubscriptionSourceResponse(android::Parcel &p, int slotId, int requestNumber,
+int radio::setCdmaSubscriptionSourceResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responseLen) {
- RLOGD("radio::setCdmaSubscriptionSourceResponse: serial %d", serial);
+ RLOGD("setCdmaSubscriptionSourceResponse: serial %d", serial);
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
@@ -4333,17 +4320,17 @@
responseInfo);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::setCdmaSubscriptionSourceResponse: radioService[%d]->mRadioResponse == NULL",
+ RLOGE("setCdmaSubscriptionSourceResponse: radioService[%d]->mRadioResponse == NULL",
slotId);
}
return 0;
}
-int radio::setCdmaRoamingPreferenceResponse(android::Parcel &p, int slotId, int requestNumber,
+int radio::setCdmaRoamingPreferenceResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responseLen) {
- RLOGD("radio::setCdmaRoamingPreferenceResponse: serial %d", serial);
+ RLOGD("setCdmaRoamingPreferenceResponse: serial %d", serial);
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
@@ -4353,17 +4340,17 @@
responseInfo);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::setCdmaRoamingPreferenceResponse: radioService[%d]->mRadioResponse == NULL",
+ RLOGE("setCdmaRoamingPreferenceResponse: radioService[%d]->mRadioResponse == NULL",
slotId);
}
return 0;
}
-int radio::getCdmaRoamingPreferenceResponse(android::Parcel &p, int slotId, int requestNumber,
+int radio::getCdmaRoamingPreferenceResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responseLen) {
- RLOGD("radio::getCdmaRoamingPreferenceResponse: serial %d", serial);
+ RLOGD("getCdmaRoamingPreferenceResponse: serial %d", serial);
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
@@ -4373,17 +4360,17 @@
responseInfo, (CdmaRoamingType) ret);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::getCdmaRoamingPreferenceResponse: radioService[%d]->mRadioResponse == NULL",
+ RLOGE("getCdmaRoamingPreferenceResponse: radioService[%d]->mRadioResponse == NULL",
slotId);
}
return 0;
}
-int radio::setTTYModeResponse(android::Parcel &p, int slotId, int requestNumber,
+int radio::setTTYModeResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responseLen) {
- RLOGD("radio::setTTYModeResponse: serial %d", serial);
+ RLOGD("setTTYModeResponse: serial %d", serial);
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
@@ -4392,16 +4379,16 @@
= radioService[slotId]->mRadioResponse->setTTYModeResponse(responseInfo);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::setTTYModeResponse: radioService[%d]->mRadioResponse == NULL", slotId);
+ RLOGE("setTTYModeResponse: radioService[%d]->mRadioResponse == NULL", slotId);
}
return 0;
}
-int radio::getTTYModeResponse(android::Parcel &p, int slotId, int requestNumber,
+int radio::getTTYModeResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responseLen) {
- RLOGD("radio::getTTYModeResponse: serial %d", serial);
+ RLOGD("getTTYModeResponse: serial %d", serial);
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
@@ -4411,16 +4398,16 @@
(TtyMode) ret);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::getTTYModeResponse: radioService[%d]->mRadioResponse == NULL", slotId);
+ RLOGE("getTTYModeResponse: radioService[%d]->mRadioResponse == NULL", slotId);
}
return 0;
}
-int radio::setPreferredVoicePrivacyResponse(android::Parcel &p, int slotId, int requestNumber,
+int radio::setPreferredVoicePrivacyResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responseLen) {
- RLOGD("radio::setPreferredVoicePrivacyResponse: serial %d", serial);
+ RLOGD("setPreferredVoicePrivacyResponse: serial %d", serial);
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
@@ -4430,17 +4417,17 @@
responseInfo);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::setPreferredVoicePrivacyResponse: radioService[%d]->mRadioResponse == NULL",
+ RLOGE("setPreferredVoicePrivacyResponse: radioService[%d]->mRadioResponse == NULL",
slotId);
}
return 0;
}
-int radio::getPreferredVoicePrivacyResponse(android::Parcel &p, int slotId, int requestNumber,
+int radio::getPreferredVoicePrivacyResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responseLen) {
- RLOGD("radio::getPreferredVoicePrivacyResponse: serial %d", serial);
+ RLOGD("getPreferredVoicePrivacyResponse: serial %d", serial);
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
@@ -4448,7 +4435,7 @@
bool enable = false;
int numInts = responseLen / sizeof(int);
if (response == NULL || numInts != 1) {
- RLOGE("radio::getPreferredVoicePrivacyResponse Invalid response: NULL");
+ RLOGE("getPreferredVoicePrivacyResponse Invalid response: NULL");
if (e == RIL_E_SUCCESS) responseInfo.error = RadioError::INVALID_RESPONSE;
} else {
int *pInt = (int *) response;
@@ -4459,17 +4446,17 @@
responseInfo, enable);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::getPreferredVoicePrivacyResponse: radioService[%d]->mRadioResponse == NULL",
+ RLOGE("getPreferredVoicePrivacyResponse: radioService[%d]->mRadioResponse == NULL",
slotId);
}
return 0;
}
-int radio::sendCDMAFeatureCodeResponse(android::Parcel &p, int slotId, int requestNumber,
+int radio::sendCDMAFeatureCodeResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responseLen) {
- RLOGD("radio::sendCDMAFeatureCodeResponse: serial %d", serial);
+ RLOGD("sendCDMAFeatureCodeResponse: serial %d", serial);
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
@@ -4478,17 +4465,17 @@
= radioService[slotId]->mRadioResponse->sendCDMAFeatureCodeResponse(responseInfo);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::sendCDMAFeatureCodeResponse: radioService[%d]->mRadioResponse == NULL",
+ RLOGE("sendCDMAFeatureCodeResponse: radioService[%d]->mRadioResponse == NULL",
slotId);
}
return 0;
}
-int radio::sendBurstDtmfResponse(android::Parcel &p, int slotId, int requestNumber,
+int radio::sendBurstDtmfResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responseLen) {
- RLOGD("radio::sendBurstDtmfResponse: serial %d", serial);
+ RLOGD("sendBurstDtmfResponse: serial %d", serial);
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
@@ -4497,16 +4484,16 @@
= radioService[slotId]->mRadioResponse->sendBurstDtmfResponse(responseInfo);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::sendBurstDtmfResponse: radioService[%d]->mRadioResponse == NULL", slotId);
+ RLOGE("sendBurstDtmfResponse: radioService[%d]->mRadioResponse == NULL", slotId);
}
return 0;
}
-int radio::sendCdmaSmsResponse(android::Parcel &p, int slotId, int requestNumber,
+int radio::sendCdmaSmsResponse(int slotId,
int responseType, int serial, RIL_Errno e, void *response,
size_t responseLen) {
- RLOGD("radio::sendCdmaSmsResponse: serial %d", serial);
+ RLOGD("sendCdmaSmsResponse: serial %d", serial);
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
@@ -4517,16 +4504,16 @@
= radioService[slotId]->mRadioResponse->sendCdmaSmsResponse(responseInfo, result);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::sendCdmaSmsResponse: radioService[%d]->mRadioResponse == NULL", slotId);
+ RLOGE("sendCdmaSmsResponse: radioService[%d]->mRadioResponse == NULL", slotId);
}
return 0;
}
-int radio::acknowledgeLastIncomingCdmaSmsResponse(android::Parcel &p, int slotId, int requestNumber,
+int radio::acknowledgeLastIncomingCdmaSmsResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responseLen) {
- RLOGD("radio::acknowledgeLastIncomingCdmaSmsResponse: serial %d", serial);
+ RLOGD("acknowledgeLastIncomingCdmaSmsResponse: serial %d", serial);
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
@@ -4536,17 +4523,17 @@
responseInfo);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::acknowledgeLastIncomingCdmaSmsResponse: radioService[%d]->mRadioResponse "
+ RLOGE("acknowledgeLastIncomingCdmaSmsResponse: radioService[%d]->mRadioResponse "
"== NULL", slotId);
}
return 0;
}
-int radio::getGsmBroadcastConfigResponse(android::Parcel &p, int slotId, int requestNumber,
+int radio::getGsmBroadcastConfigResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responseLen) {
- RLOGD("radio::getGsmBroadcastConfigResponse: serial %d", serial);
+ RLOGD("getGsmBroadcastConfigResponse: serial %d", serial);
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
@@ -4554,7 +4541,7 @@
hidl_vec<GsmBroadcastSmsConfigInfo> configs;
if (response == NULL || responseLen % sizeof(RIL_GSM_BroadcastSmsConfigInfo *) != 0) {
- RLOGE("radio::getGsmBroadcastConfigResponse Invalid response: NULL");
+ RLOGE("getGsmBroadcastConfigResponse Invalid response: NULL");
if (e == RIL_E_SUCCESS) responseInfo.error = RadioError::INVALID_RESPONSE;
} else {
int num = responseLen / sizeof(RIL_GSM_BroadcastSmsConfigInfo *);
@@ -4575,17 +4562,17 @@
configs);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::getGsmBroadcastConfigResponse: radioService[%d]->mRadioResponse == NULL",
+ RLOGE("getGsmBroadcastConfigResponse: radioService[%d]->mRadioResponse == NULL",
slotId);
}
return 0;
}
-int radio::setGsmBroadcastConfigResponse(android::Parcel &p, int slotId, int requestNumber,
+int radio::setGsmBroadcastConfigResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responseLen) {
- RLOGD("radio::setGsmBroadcastConfigResponse: serial %d", serial);
+ RLOGD("setGsmBroadcastConfigResponse: serial %d", serial);
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
@@ -4594,17 +4581,17 @@
= radioService[slotId]->mRadioResponse->setGsmBroadcastConfigResponse(responseInfo);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::setGsmBroadcastConfigResponse: radioService[%d]->mRadioResponse == NULL",
+ RLOGE("setGsmBroadcastConfigResponse: radioService[%d]->mRadioResponse == NULL",
slotId);
}
return 0;
}
-int radio::setGsmBroadcastActivationResponse(android::Parcel &p, int slotId, int requestNumber,
+int radio::setGsmBroadcastActivationResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responseLen) {
- RLOGD("radio::setGsmBroadcastActivationResponse: serial %d", serial);
+ RLOGD("setGsmBroadcastActivationResponse: serial %d", serial);
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
@@ -4614,17 +4601,17 @@
responseInfo);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::setGsmBroadcastActivationResponse: radioService[%d]->mRadioResponse == NULL",
+ RLOGE("setGsmBroadcastActivationResponse: radioService[%d]->mRadioResponse == NULL",
slotId);
}
return 0;
}
-int radio::getCdmaBroadcastConfigResponse(android::Parcel &p, int slotId, int requestNumber,
+int radio::getCdmaBroadcastConfigResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responseLen) {
- RLOGD("radio::getCdmaBroadcastConfigResponse: serial %d", serial);
+ RLOGD("getCdmaBroadcastConfigResponse: serial %d", serial);
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
@@ -4632,7 +4619,7 @@
hidl_vec<CdmaBroadcastSmsConfigInfo> configs;
if (response == NULL || responseLen % sizeof(RIL_CDMA_BroadcastSmsConfigInfo *) != 0) {
- RLOGE("radio::getCdmaBroadcastConfigResponse Invalid response: NULL");
+ RLOGE("getCdmaBroadcastConfigResponse Invalid response: NULL");
if (e == RIL_E_SUCCESS) responseInfo.error = RadioError::INVALID_RESPONSE;
} else {
int num = responseLen / sizeof(RIL_CDMA_BroadcastSmsConfigInfo *);
@@ -4651,17 +4638,17 @@
configs);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::getCdmaBroadcastConfigResponse: radioService[%d]->mRadioResponse == NULL",
+ RLOGE("getCdmaBroadcastConfigResponse: radioService[%d]->mRadioResponse == NULL",
slotId);
}
return 0;
}
-int radio::setCdmaBroadcastConfigResponse(android::Parcel &p, int slotId, int requestNumber,
+int radio::setCdmaBroadcastConfigResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responseLen) {
- RLOGD("radio::setCdmaBroadcastConfigResponse: serial %d", serial);
+ RLOGD("setCdmaBroadcastConfigResponse: serial %d", serial);
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
@@ -4671,17 +4658,17 @@
responseInfo);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::setCdmaBroadcastConfigResponse: radioService[%d]->mRadioResponse == NULL",
+ RLOGE("setCdmaBroadcastConfigResponse: radioService[%d]->mRadioResponse == NULL",
slotId);
}
return 0;
}
-int radio::setCdmaBroadcastActivationResponse(android::Parcel &p, int slotId, int requestNumber,
+int radio::setCdmaBroadcastActivationResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responseLen) {
- RLOGD("radio::setCdmaBroadcastActivationResponse: serial %d", serial);
+ RLOGD("setCdmaBroadcastActivationResponse: serial %d", serial);
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
@@ -4691,17 +4678,17 @@
responseInfo);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::setCdmaBroadcastActivationResponse: radioService[%d]->mRadioResponse == NULL",
+ RLOGE("setCdmaBroadcastActivationResponse: radioService[%d]->mRadioResponse == NULL",
slotId);
}
return 0;
}
-int radio::getCDMASubscriptionResponse(android::Parcel &p, int slotId, int requestNumber,
+int radio::getCDMASubscriptionResponse(int slotId,
int responseType, int serial, RIL_Errno e, void *response,
size_t responseLen) {
- RLOGD("radio::getCDMASubscriptionResponse: serial %d", serial);
+ RLOGD("getCDMASubscriptionResponse: serial %d", serial);
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
@@ -4710,7 +4697,7 @@
int numStrings = responseLen / sizeof(char *);
hidl_string emptyString;
if (response == NULL || numStrings != 5) {
- RLOGE("radio::getOperatorResponse Invalid response: NULL");
+ RLOGE("getOperatorResponse Invalid response: NULL");
if (e == RIL_E_SUCCESS) responseInfo.error = RadioError::INVALID_RESPONSE;
Return<void> retStatus
= radioService[slotId]->mRadioResponse->getCDMASubscriptionResponse(
@@ -4729,17 +4716,17 @@
radioService[slotId]->checkReturnStatus(retStatus);
}
} else {
- RLOGE("radio::getCDMASubscriptionResponse: radioService[%d]->mRadioResponse == NULL",
+ RLOGE("getCDMASubscriptionResponse: radioService[%d]->mRadioResponse == NULL",
slotId);
}
return 0;
}
-int radio::writeSmsToRuimResponse(android::Parcel &p, int slotId, int requestNumber,
+int radio::writeSmsToRuimResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responseLen) {
- RLOGD("radio::writeSmsToRuimResponse: serial %d", serial);
+ RLOGD("writeSmsToRuimResponse: serial %d", serial);
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
@@ -4748,16 +4735,16 @@
= radioService[slotId]->mRadioResponse->writeSmsToRuimResponse(responseInfo, ret);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::writeSmsToRuimResponse: radioService[%d]->mRadioResponse == NULL", slotId);
+ RLOGE("writeSmsToRuimResponse: radioService[%d]->mRadioResponse == NULL", slotId);
}
return 0;
}
-int radio::deleteSmsOnRuimResponse(android::Parcel &p, int slotId, int requestNumber,
+int radio::deleteSmsOnRuimResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responseLen) {
- RLOGD("radio::deleteSmsOnRuimResponse: serial %d", serial);
+ RLOGD("deleteSmsOnRuimResponse: serial %d", serial);
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
@@ -4766,16 +4753,16 @@
= radioService[slotId]->mRadioResponse->deleteSmsOnRuimResponse(responseInfo);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::deleteSmsOnRuimResponse: radioService[%d]->mRadioResponse == NULL", slotId);
+ RLOGE("deleteSmsOnRuimResponse: radioService[%d]->mRadioResponse == NULL", slotId);
}
return 0;
}
-int radio::getDeviceIdentityResponse(android::Parcel &p, int slotId, int requestNumber,
+int radio::getDeviceIdentityResponse(int slotId,
int responseType, int serial, RIL_Errno e, void *response,
size_t responseLen) {
- RLOGD("radio::getDeviceIdentityResponse: serial %d", serial);
+ RLOGD("getDeviceIdentityResponse: serial %d", serial);
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
@@ -4784,7 +4771,7 @@
int numStrings = responseLen / sizeof(char *);
hidl_string emptyString;
if (response == NULL || numStrings != 4) {
- RLOGE("radio::getDeviceIdentityResponse Invalid response: NULL");
+ RLOGE("getDeviceIdentityResponse Invalid response: NULL");
if (e == RIL_E_SUCCESS) responseInfo.error = RadioError::INVALID_RESPONSE;
Return<void> retStatus
= radioService[slotId]->mRadioResponse->getDeviceIdentityResponse(responseInfo,
@@ -4801,17 +4788,17 @@
radioService[slotId]->checkReturnStatus(retStatus);
}
} else {
- RLOGE("radio::getDeviceIdentityResponse: radioService[%d]->mRadioResponse == NULL",
+ RLOGE("getDeviceIdentityResponse: radioService[%d]->mRadioResponse == NULL",
slotId);
}
return 0;
}
-int radio::exitEmergencyCallbackModeResponse(android::Parcel &p, int slotId, int requestNumber,
+int radio::exitEmergencyCallbackModeResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responseLen) {
- RLOGD("radio::exitEmergencyCallbackModeResponse: serial %d", serial);
+ RLOGD("exitEmergencyCallbackModeResponse: serial %d", serial);
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
@@ -4821,17 +4808,17 @@
responseInfo);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::exitEmergencyCallbackModeResponse: radioService[%d]->mRadioResponse == NULL",
+ RLOGE("exitEmergencyCallbackModeResponse: radioService[%d]->mRadioResponse == NULL",
slotId);
}
return 0;
}
-int radio::getSmscAddressResponse(android::Parcel &p, int slotId, int requestNumber,
+int radio::getSmscAddressResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responseLen) {
- RLOGD("radio::getSmscAddressResponse: serial %d", serial);
+ RLOGD("getSmscAddressResponse: serial %d", serial);
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
@@ -4841,16 +4828,16 @@
convertCharPtrToHidlString((char *) response));
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::getSmscAddressResponse: radioService[%d]->mRadioResponse == NULL", slotId);
+ RLOGE("getSmscAddressResponse: radioService[%d]->mRadioResponse == NULL", slotId);
}
return 0;
}
-int radio::setSmscAddressResponse(android::Parcel &p, int slotId, int requestNumber,
+int radio::setSmscAddressResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responseLen) {
- RLOGD("radio::setSmscAddressResponse: serial %d", serial);
+ RLOGD("setSmscAddressResponse: serial %d", serial);
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
@@ -4859,16 +4846,16 @@
= radioService[slotId]->mRadioResponse->setSmscAddressResponse(responseInfo);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::setSmscAddressResponse: radioService[%d]->mRadioResponse == NULL", slotId);
+ RLOGE("setSmscAddressResponse: radioService[%d]->mRadioResponse == NULL", slotId);
}
return 0;
}
-int radio::reportSmsMemoryStatusResponse(android::Parcel &p, int slotId, int requestNumber,
+int radio::reportSmsMemoryStatusResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responseLen) {
- RLOGD("radio::reportSmsMemoryStatusResponse: serial %d", serial);
+ RLOGD("reportSmsMemoryStatusResponse: serial %d", serial);
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
@@ -4877,17 +4864,17 @@
= radioService[slotId]->mRadioResponse->reportSmsMemoryStatusResponse(responseInfo);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::reportSmsMemoryStatusResponse: radioService[%d]->mRadioResponse == NULL",
+ RLOGE("reportSmsMemoryStatusResponse: radioService[%d]->mRadioResponse == NULL",
slotId);
}
return 0;
}
-int radio::reportStkServiceIsRunningResponse(android::Parcel &p, int slotId, int requestNumber,
+int radio::reportStkServiceIsRunningResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responseLen) {
- RLOGD("radio::reportStkServiceIsRunningResponse: serial %d", serial);
+ RLOGD("reportStkServiceIsRunningResponse: serial %d", serial);
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
@@ -4896,17 +4883,17 @@
reportStkServiceIsRunningResponse(responseInfo);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::reportStkServiceIsRunningResponse: radioService[%d]->mRadioResponse == NULL",
+ RLOGE("reportStkServiceIsRunningResponse: radioService[%d]->mRadioResponse == NULL",
slotId);
}
return 0;
}
-int radio::getCdmaSubscriptionSourceResponse(android::Parcel &p, int slotId, int requestNumber,
+int radio::getCdmaSubscriptionSourceResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responseLen) {
- RLOGD("radio::getCdmaSubscriptionSourceResponse: serial %d", serial);
+ RLOGD("getCdmaSubscriptionSourceResponse: serial %d", serial);
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
@@ -4916,17 +4903,17 @@
responseInfo, (CdmaSubscriptionSource) ret);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::getCdmaSubscriptionSourceResponse: radioService[%d]->mRadioResponse == NULL",
+ RLOGE("getCdmaSubscriptionSourceResponse: radioService[%d]->mRadioResponse == NULL",
slotId);
}
return 0;
}
-int radio::requestIsimAuthenticationResponse(android::Parcel &p, int slotId, int requestNumber,
+int radio::requestIsimAuthenticationResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responseLen) {
- RLOGD("radio::requestIsimAuthenticationResponse: serial %d", serial);
+ RLOGD("requestIsimAuthenticationResponse: serial %d", serial);
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
@@ -4937,18 +4924,18 @@
convertCharPtrToHidlString((char *) response));
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::requestIsimAuthenticationResponse: radioService[%d]->mRadioResponse == NULL",
+ RLOGE("requestIsimAuthenticationResponse: radioService[%d]->mRadioResponse == NULL",
slotId);
}
return 0;
}
-int radio::acknowledgeIncomingGsmSmsWithPduResponse(android::Parcel &p, int slotId,
- int requestNumber, int responseType,
+int radio::acknowledgeIncomingGsmSmsWithPduResponse(int slotId,
+ int responseType,
int serial, RIL_Errno e, void *response,
size_t responseLen) {
- RLOGD("radio::acknowledgeIncomingGsmSmsWithPduResponse: serial %d", serial);
+ RLOGD("acknowledgeIncomingGsmSmsWithPduResponse: serial %d", serial);
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
@@ -4958,17 +4945,17 @@
responseInfo);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::acknowledgeIncomingGsmSmsWithPduResponse: radioService[%d]->mRadioResponse "
+ RLOGE("acknowledgeIncomingGsmSmsWithPduResponse: radioService[%d]->mRadioResponse "
"== NULL", slotId);
}
return 0;
}
-int radio::sendEnvelopeWithStatusResponse(android::Parcel &p, int slotId, int requestNumber,
+int radio::sendEnvelopeWithStatusResponse(int slotId,
int responseType, int serial, RIL_Errno e, void *response,
size_t responseLen) {
- RLOGD("radio::sendEnvelopeWithStatusResponse: serial %d", serial);
+ RLOGD("sendEnvelopeWithStatusResponse: serial %d", serial);
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
@@ -4980,17 +4967,17 @@
result);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::sendEnvelopeWithStatusResponse: radioService[%d]->mRadioResponse == NULL",
+ RLOGE("sendEnvelopeWithStatusResponse: radioService[%d]->mRadioResponse == NULL",
slotId);
}
return 0;
}
-int radio::getVoiceRadioTechnologyResponse(android::Parcel &p, int slotId, int requestNumber,
+int radio::getVoiceRadioTechnologyResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responseLen) {
- RLOGD("radio::getVoiceRadioTechnologyResponse: serial %d", serial);
+ RLOGD("getVoiceRadioTechnologyResponse: serial %d", serial);
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
@@ -5000,18 +4987,18 @@
responseInfo, (RadioTechnology) ret);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::getVoiceRadioTechnologyResponse: radioService[%d]->mRadioResponse == NULL",
+ RLOGE("getVoiceRadioTechnologyResponse: radioService[%d]->mRadioResponse == NULL",
slotId);
}
return 0;
}
-int radio::getCellInfoListResponse(android::Parcel &p, int slotId,
- int requestNumber, int responseType,
+int radio::getCellInfoListResponse(int slotId,
+ int responseType,
int serial, RIL_Errno e, void *response,
size_t responseLen) {
- RLOGD("radio::getCellInfoListResponse: serial %d", serial);
+ RLOGD("getCellInfoListResponse: serial %d", serial);
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
@@ -5019,7 +5006,7 @@
hidl_vec<CellInfo> ret;
if (response == NULL || responseLen % sizeof(RIL_CellInfo_v12) != 0) {
- RLOGE("radio::getCellInfoListResponse: Invalid response");
+ RLOGE("getCellInfoListResponse: Invalid response");
if (e == RIL_E_SUCCESS) responseInfo.error = RadioError::INVALID_RESPONSE;
} else {
convertRilCellInfoListToHal(response, responseLen, ret);
@@ -5029,17 +5016,17 @@
responseInfo, ret);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::getCellInfoListResponse: radioService[%d]->mRadioResponse == NULL", slotId);
+ RLOGE("getCellInfoListResponse: radioService[%d]->mRadioResponse == NULL", slotId);
}
return 0;
}
-int radio::setCellInfoListRateResponse(android::Parcel &p, int slotId,
- int requestNumber, int responseType,
+int radio::setCellInfoListRateResponse(int slotId,
+ int responseType,
int serial, RIL_Errno e, void *response,
size_t responseLen) {
- RLOGD("radio::setCellInfoListRateResponse: serial %d", serial);
+ RLOGD("setCellInfoListRateResponse: serial %d", serial);
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
@@ -5048,17 +5035,17 @@
= radioService[slotId]->mRadioResponse->setCellInfoListRateResponse(responseInfo);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::setCellInfoListRateResponse: radioService[%d]->mRadioResponse == NULL",
+ RLOGE("setCellInfoListRateResponse: radioService[%d]->mRadioResponse == NULL",
slotId);
}
return 0;
}
-int radio::setInitialAttachApnResponse(android::Parcel &p, int slotId, int requestNumber,
+int radio::setInitialAttachApnResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responseLen) {
- RLOGD("radio::setInitialAttachApnResponse: serial %d", serial);
+ RLOGD("setInitialAttachApnResponse: serial %d", serial);
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
@@ -5067,17 +5054,17 @@
= radioService[slotId]->mRadioResponse->setInitialAttachApnResponse(responseInfo);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::setInitialAttachApnResponse: radioService[%d]->mRadioResponse == NULL",
+ RLOGE("setInitialAttachApnResponse: radioService[%d]->mRadioResponse == NULL",
slotId);
}
return 0;
}
-int radio::getImsRegistrationStateResponse(android::Parcel &p, int slotId, int requestNumber,
+int radio::getImsRegistrationStateResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responseLen) {
- RLOGD("radio::getImsRegistrationStateResponse: serial %d", serial);
+ RLOGD("getImsRegistrationStateResponse: serial %d", serial);
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
@@ -5086,7 +5073,7 @@
int ratFamily = 0;
int numInts = responseLen / sizeof(int);
if (response == NULL || numInts != 2) {
- RLOGE("radio::getImsRegistrationStateResponse Invalid response: NULL");
+ RLOGE("getImsRegistrationStateResponse Invalid response: NULL");
if (e == RIL_E_SUCCESS) responseInfo.error = RadioError::INVALID_RESPONSE;
} else {
int *pInt = (int *) response;
@@ -5098,17 +5085,17 @@
responseInfo, isRegistered, (RadioTechnologyFamily) ratFamily);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::getImsRegistrationStateResponse: radioService[%d]->mRadioResponse == NULL",
+ RLOGE("getImsRegistrationStateResponse: radioService[%d]->mRadioResponse == NULL",
slotId);
}
return 0;
}
-int radio::sendImsSmsResponse(android::Parcel &p, int slotId, int requestNumber,
+int radio::sendImsSmsResponse(int slotId,
int responseType, int serial, RIL_Errno e, void *response,
size_t responseLen) {
- RLOGD("radio::sendImsSmsResponse: serial %d", serial);
+ RLOGD("sendImsSmsResponse: serial %d", serial);
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
@@ -5119,16 +5106,16 @@
= radioService[slotId]->mRadioResponse->sendImsSmsResponse(responseInfo, result);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::sendSmsResponse: radioService[%d]->mRadioResponse == NULL", slotId);
+ RLOGE("sendSmsResponse: radioService[%d]->mRadioResponse == NULL", slotId);
}
return 0;
}
-int radio::iccTransmitApduBasicChannelResponse(android::Parcel &p, int slotId, int requestNumber,
+int radio::iccTransmitApduBasicChannelResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responseLen) {
- RLOGD("radio::iccTransmitApduBasicChannelResponse: serial %d", serial);
+ RLOGD("iccTransmitApduBasicChannelResponse: serial %d", serial);
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
@@ -5140,17 +5127,17 @@
responseInfo, result);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::iccTransmitApduBasicChannelResponse: radioService[%d]->mRadioResponse "
+ RLOGE("iccTransmitApduBasicChannelResponse: radioService[%d]->mRadioResponse "
"== NULL", slotId);
}
return 0;
}
-int radio::iccOpenLogicalChannelResponse(android::Parcel &p, int slotId, int requestNumber,
+int radio::iccOpenLogicalChannelResponse(int slotId,
int responseType, int serial, RIL_Errno e, void *response,
size_t responseLen) {
- RLOGD("radio::iccOpenLogicalChannelResponse: serial %d", serial);
+ RLOGD("iccOpenLogicalChannelResponse: serial %d", serial);
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
@@ -5159,7 +5146,7 @@
hidl_vec<int8_t> selectResponse;
int numInts = responseLen / sizeof(int);
if (response == NULL || responseLen % sizeof(int) != 0) {
- RLOGE("radio::iccOpenLogicalChannelResponse Invalid response: NULL");
+ RLOGE("iccOpenLogicalChannelResponse Invalid response: NULL");
if (e == RIL_E_SUCCESS) responseInfo.error = RadioError::INVALID_RESPONSE;
} else {
int *pInt = (int *) response;
@@ -5174,17 +5161,17 @@
channelId, selectResponse);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::iccOpenLogicalChannelResponse: radioService[%d]->mRadioResponse == NULL",
+ RLOGE("iccOpenLogicalChannelResponse: radioService[%d]->mRadioResponse == NULL",
slotId);
}
return 0;
}
-int radio::iccCloseLogicalChannelResponse(android::Parcel &p, int slotId, int requestNumber,
+int radio::iccCloseLogicalChannelResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responseLen) {
- RLOGD("radio::iccCloseLogicalChannelResponse: serial %d", serial);
+ RLOGD("iccCloseLogicalChannelResponse: serial %d", serial);
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
@@ -5194,17 +5181,17 @@
responseInfo);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::iccCloseLogicalChannelResponse: radioService[%d]->mRadioResponse == NULL",
+ RLOGE("iccCloseLogicalChannelResponse: radioService[%d]->mRadioResponse == NULL",
slotId);
}
return 0;
}
-int radio::iccTransmitApduLogicalChannelResponse(android::Parcel &p, int slotId, int requestNumber,
+int radio::iccTransmitApduLogicalChannelResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responseLen) {
- RLOGD("radio::iccTransmitApduLogicalChannelResponse: serial %d", serial);
+ RLOGD("iccTransmitApduLogicalChannelResponse: serial %d", serial);
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
@@ -5216,17 +5203,17 @@
responseInfo, result);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::iccTransmitApduLogicalChannelResponse: radioService[%d]->mRadioResponse "
+ RLOGE("iccTransmitApduLogicalChannelResponse: radioService[%d]->mRadioResponse "
"== NULL", slotId);
}
return 0;
}
-int radio::nvReadItemResponse(android::Parcel &p, int slotId, int requestNumber,
+int radio::nvReadItemResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responseLen) {
- RLOGD("radio::nvReadItemResponse: serial %d", serial);
+ RLOGD("nvReadItemResponse: serial %d", serial);
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
@@ -5236,16 +5223,16 @@
convertCharPtrToHidlString((char *) response));
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::nvReadItemResponse: radioService[%d]->mRadioResponse == NULL", slotId);
+ RLOGE("nvReadItemResponse: radioService[%d]->mRadioResponse == NULL", slotId);
}
return 0;
}
-int radio::nvWriteItemResponse(android::Parcel &p, int slotId, int requestNumber,
+int radio::nvWriteItemResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responseLen) {
- RLOGD("radio::nvWriteItemResponse: serial %d", serial);
+ RLOGD("nvWriteItemResponse: serial %d", serial);
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
@@ -5254,16 +5241,16 @@
= radioService[slotId]->mRadioResponse->nvWriteItemResponse(responseInfo);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::nvWriteItemResponse: radioService[%d]->mRadioResponse == NULL", slotId);
+ RLOGE("nvWriteItemResponse: radioService[%d]->mRadioResponse == NULL", slotId);
}
return 0;
}
-int radio::nvWriteCdmaPrlResponse(android::Parcel &p, int slotId, int requestNumber,
+int radio::nvWriteCdmaPrlResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responseLen) {
- RLOGD("radio::nvWriteCdmaPrlResponse: serial %d", serial);
+ RLOGD("nvWriteCdmaPrlResponse: serial %d", serial);
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
@@ -5272,16 +5259,16 @@
= radioService[slotId]->mRadioResponse->nvWriteCdmaPrlResponse(responseInfo);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::nvWriteCdmaPrlResponse: radioService[%d]->mRadioResponse == NULL", slotId);
+ RLOGE("nvWriteCdmaPrlResponse: radioService[%d]->mRadioResponse == NULL", slotId);
}
return 0;
}
-int radio::nvResetConfigResponse(android::Parcel &p, int slotId, int requestNumber,
+int radio::nvResetConfigResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responseLen) {
- RLOGD("radio::nvResetConfigResponse: serial %d", serial);
+ RLOGD("nvResetConfigResponse: serial %d", serial);
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
@@ -5290,16 +5277,16 @@
= radioService[slotId]->mRadioResponse->nvResetConfigResponse(responseInfo);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::nvResetConfigResponse: radioService[%d]->mRadioResponse == NULL", slotId);
+ RLOGE("nvResetConfigResponse: radioService[%d]->mRadioResponse == NULL", slotId);
}
return 0;
}
-int radio::setUiccSubscriptionResponse(android::Parcel &p, int slotId, int requestNumber,
+int radio::setUiccSubscriptionResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responseLen) {
- RLOGD("radio::setUiccSubscriptionResponse: serial %d", serial);
+ RLOGD("setUiccSubscriptionResponse: serial %d", serial);
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
@@ -5308,17 +5295,17 @@
= radioService[slotId]->mRadioResponse->setUiccSubscriptionResponse(responseInfo);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::setUiccSubscriptionResponse: radioService[%d]->mRadioResponse == NULL",
+ RLOGE("setUiccSubscriptionResponse: radioService[%d]->mRadioResponse == NULL",
slotId);
}
return 0;
}
-int radio::setDataAllowedResponse(android::Parcel &p, int slotId, int requestNumber,
+int radio::setDataAllowedResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responseLen) {
- RLOGD("radio::setDataAllowedResponse: serial %d", serial);
+ RLOGD("setDataAllowedResponse: serial %d", serial);
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
@@ -5327,16 +5314,16 @@
= radioService[slotId]->mRadioResponse->setDataAllowedResponse(responseInfo);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::setDataAllowedResponse: radioService[%d]->mRadioResponse == NULL", slotId);
+ RLOGE("setDataAllowedResponse: radioService[%d]->mRadioResponse == NULL", slotId);
}
return 0;
}
-int radio::getHardwareConfigResponse(android::Parcel &p, int slotId, int requestNumber,
+int radio::getHardwareConfigResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responseLen) {
- RLOGD("radio::getHardwareConfigResponse: serial %d", serial);
+ RLOGD("getHardwareConfigResponse: serial %d", serial);
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
@@ -5344,7 +5331,7 @@
hidl_vec<HardwareConfig> result;
if (response == NULL || responseLen % sizeof(RIL_HardwareConfig) != 0) {
- RLOGE("radio::hardwareConfigChangedInd: invalid response");
+ RLOGE("hardwareConfigChangedInd: invalid response");
if (e == RIL_E_SUCCESS) responseInfo.error = RadioError::INVALID_RESPONSE;
} else {
convertRilHardwareConfigListToHal(response, responseLen, result);
@@ -5354,16 +5341,16 @@
responseInfo, result);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::getHardwareConfigResponse: radioService[%d]->mRadioResponse == NULL", slotId);
+ RLOGE("getHardwareConfigResponse: radioService[%d]->mRadioResponse == NULL", slotId);
}
return 0;
}
-int radio::requestIccSimAuthenticationResponse(android::Parcel &p, int slotId, int requestNumber,
+int radio::requestIccSimAuthenticationResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responseLen) {
- RLOGD("radio::requestIccSimAuthenticationResponse: serial %d", serial);
+ RLOGD("requestIccSimAuthenticationResponse: serial %d", serial);
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
@@ -5375,17 +5362,17 @@
responseInfo, result);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::requestIccSimAuthenticationResponse: radioService[%d]->mRadioResponse "
+ RLOGE("requestIccSimAuthenticationResponse: radioService[%d]->mRadioResponse "
"== NULL", slotId);
}
return 0;
}
-int radio::setDataProfileResponse(android::Parcel &p, int slotId, int requestNumber,
+int radio::setDataProfileResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responseLen) {
- RLOGD("radio::setDataProfileResponse: serial %d", serial);
+ RLOGD("setDataProfileResponse: serial %d", serial);
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
@@ -5394,16 +5381,16 @@
= radioService[slotId]->mRadioResponse->setDataProfileResponse(responseInfo);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::setDataProfileResponse: radioService[%d]->mRadioResponse == NULL", slotId);
+ RLOGE("setDataProfileResponse: radioService[%d]->mRadioResponse == NULL", slotId);
}
return 0;
}
-int radio::requestShutdownResponse(android::Parcel &p, int slotId, int requestNumber,
+int radio::requestShutdownResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responseLen) {
- RLOGD("radio::requestShutdownResponse: serial %d", serial);
+ RLOGD("requestShutdownResponse: serial %d", serial);
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
@@ -5412,7 +5399,7 @@
= radioService[slotId]->mRadioResponse->requestShutdownResponse(responseInfo);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::requestShutdownResponse: radioService[%d]->mRadioResponse == NULL", slotId);
+ RLOGE("requestShutdownResponse: radioService[%d]->mRadioResponse == NULL", slotId);
}
return 0;
@@ -5431,10 +5418,10 @@
}
}
-int radio::getRadioCapabilityResponse(android::Parcel &p, int slotId, int requestNumber,
+int radio::getRadioCapabilityResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responseLen) {
- RLOGD("radio::getRadioCapabilityResponse: serial %d", serial);
+ RLOGD("getRadioCapabilityResponse: serial %d", serial);
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
@@ -5445,16 +5432,16 @@
responseInfo, result);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::getRadioCapabilityResponse: radioService[%d]->mRadioResponse == NULL", slotId);
+ RLOGE("getRadioCapabilityResponse: radioService[%d]->mRadioResponse == NULL", slotId);
}
return 0;
}
-int radio::setRadioCapabilityResponse(android::Parcel &p, int slotId, int requestNumber,
+int radio::setRadioCapabilityResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responseLen) {
- RLOGD("radio::setRadioCapabilityResponse: serial %d", serial);
+ RLOGD("setRadioCapabilityResponse: serial %d", serial);
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
@@ -5465,7 +5452,7 @@
responseInfo, result);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::setRadioCapabilityResponse: radioService[%d]->mRadioResponse == NULL", slotId);
+ RLOGE("setRadioCapabilityResponse: radioService[%d]->mRadioResponse == NULL", slotId);
}
return 0;
@@ -5487,10 +5474,10 @@
return result;
}
-int radio::startLceServiceResponse(android::Parcel &p, int slotId, int requestNumber,
+int radio::startLceServiceResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responseLen) {
- RLOGD("radio::startLceServiceResponse: serial %d", serial);
+ RLOGD("startLceServiceResponse: serial %d", serial);
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
@@ -5502,16 +5489,16 @@
result);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::startLceServiceResponse: radioService[%d]->mRadioResponse == NULL", slotId);
+ RLOGE("startLceServiceResponse: radioService[%d]->mRadioResponse == NULL", slotId);
}
return 0;
}
-int radio::stopLceServiceResponse(android::Parcel &p, int slotId, int requestNumber,
+int radio::stopLceServiceResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responseLen) {
- RLOGD("radio::stopLceServiceResponse: serial %d", serial);
+ RLOGD("stopLceServiceResponse: serial %d", serial);
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
@@ -5523,16 +5510,16 @@
result);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::stopLceServiceResponse: radioService[%d]->mRadioResponse == NULL", slotId);
+ RLOGE("stopLceServiceResponse: radioService[%d]->mRadioResponse == NULL", slotId);
}
return 0;
}
-int radio::pullLceDataResponse(android::Parcel &p, int slotId, int requestNumber,
+int radio::pullLceDataResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responseLen) {
- RLOGD("radio::pullLceDataResponse: serial %d", serial);
+ RLOGD("pullLceDataResponse: serial %d", serial);
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
@@ -5540,7 +5527,7 @@
LceDataInfo result = {};
if (response == NULL || responseLen != sizeof(RIL_LceDataInfo)) {
- RLOGE("radio::pullLceDataResponse: Invalid response");
+ RLOGE("pullLceDataResponse: Invalid response");
if (e == RIL_E_SUCCESS) responseInfo.error = RadioError::INVALID_RESPONSE;
} else {
convertRilLceDataInfoToHal(response, responseLen, result);
@@ -5550,23 +5537,23 @@
responseInfo, result);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::pullLceDataResponse: radioService[%d]->mRadioResponse == NULL", slotId);
+ RLOGE("pullLceDataResponse: radioService[%d]->mRadioResponse == NULL", slotId);
}
return 0;
}
-int radio::getModemActivityInfoResponse(android::Parcel &p, int slotId, int requestNumber,
+int radio::getModemActivityInfoResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responseLen) {
- RLOGD("radio::getModemActivityInfoResponse: serial %d", serial);
+ RLOGD("getModemActivityInfoResponse: serial %d", serial);
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
populateResponseInfo(responseInfo, serial, responseType, e);
ActivityStatsInfo info;
if (response == NULL || responseLen != sizeof(RIL_ActivityStatsInfo)) {
- RLOGE("radio::getModemActivityInfoResponse Invalid response: NULL");
+ RLOGE("getModemActivityInfoResponse Invalid response: NULL");
if (e == RIL_E_SUCCESS) responseInfo.error = RadioError::INVALID_RESPONSE;
} else {
RIL_ActivityStatsInfo *resp = (RIL_ActivityStatsInfo *)response;
@@ -5583,17 +5570,17 @@
info);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::getModemActivityInfoResponse: radioService[%d]->mRadioResponse == NULL",
+ RLOGE("getModemActivityInfoResponse: radioService[%d]->mRadioResponse == NULL",
slotId);
}
return 0;
}
-int radio::setAllowedCarriersResponse(android::Parcel &p, int slotId, int requestNumber,
+int radio::setAllowedCarriersResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responseLen) {
- RLOGD("radio::setAllowedCarriersResponse: serial %d", serial);
+ RLOGD("setAllowedCarriersResponse: serial %d", serial);
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
@@ -5603,17 +5590,17 @@
ret);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::setAllowedCarriersResponse: radioService[%d]->mRadioResponse == NULL",
+ RLOGE("setAllowedCarriersResponse: radioService[%d]->mRadioResponse == NULL",
slotId);
}
return 0;
}
-int radio::getAllowedCarriersResponse(android::Parcel &p, int slotId, int requestNumber,
+int radio::getAllowedCarriersResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responseLen) {
- RLOGD("radio::getAllowedCarriersResponse: serial %d", serial);
+ RLOGD("getAllowedCarriersResponse: serial %d", serial);
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
@@ -5621,7 +5608,7 @@
CarrierRestrictions carrierInfo = {};
bool allAllowed = true;
if (response == NULL || responseLen != sizeof(RIL_CarrierRestrictions)) {
- RLOGE("radio::getAllowedCarriersResponse Invalid response: NULL");
+ RLOGE("getAllowedCarriersResponse Invalid response: NULL");
if (e == RIL_E_SUCCESS) responseInfo.error = RadioError::INVALID_RESPONSE;
} else {
RIL_CarrierRestrictions *pCr = (RIL_CarrierRestrictions *)response;
@@ -5655,17 +5642,17 @@
allAllowed, carrierInfo);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::getAllowedCarriersResponse: radioService[%d]->mRadioResponse == NULL",
+ RLOGE("getAllowedCarriersResponse: radioService[%d]->mRadioResponse == NULL",
slotId);
}
return 0;
}
-int radio::sendDeviceStateResponse(android::Parcel &p, int slotId, int requestNumber,
+int radio::sendDeviceStateResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responselen) {
- RLOGD("radio::sendDeviceStateResponse: serial %d", serial);
+ RLOGD("sendDeviceStateResponse: serial %d", serial);
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
@@ -5674,16 +5661,16 @@
= radioService[slotId]->mRadioResponse->sendDeviceStateResponse(responseInfo);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::sendDeviceStateResponse: radioService[%d]->mRadioResponse == NULL", slotId);
+ RLOGE("sendDeviceStateResponse: radioService[%d]->mRadioResponse == NULL", slotId);
}
return 0;
}
-int radio::setIndicationFilterResponse(android::Parcel &p, int slotId, int requestNumber,
+int radio::setIndicationFilterResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responselen) {
- RLOGD("radio::setIndicationFilterResponse: serial %d", serial);
+ RLOGD("setIndicationFilterResponse: serial %d", serial);
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
@@ -5692,7 +5679,7 @@
= radioService[slotId]->mRadioResponse->setIndicationFilterResponse(responseInfo);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::setIndicationFilterResponse: radioService[%d]->mRadioResponse == NULL",
+ RLOGE("setIndicationFilterResponse: radioService[%d]->mRadioResponse == NULL",
slotId);
}
@@ -5700,10 +5687,10 @@
}
-int radio::setSimCardPowerResponse(android::Parcel &p, int slotId, int requestNumber,
+int radio::setSimCardPowerResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responseLen) {
- RLOGD("radio::setSimCardPowerResponse: serial %d", serial);
+ RLOGD("setSimCardPowerResponse: serial %d", serial);
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
@@ -5712,16 +5699,16 @@
= radioService[slotId]->mRadioResponse->setSimCardPowerResponse(responseInfo);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::setSimCardPowerResponse: radioService[%d]->mRadioResponse == NULL", slotId);
+ RLOGE("setSimCardPowerResponse: radioService[%d]->mRadioResponse == NULL", slotId);
}
return 0;
}
-int radio::sendRequestRawResponse(android::Parcel &p, int slotId, int requestNumber,
+int radio::sendRequestRawResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responseLen) {
- RLOGD("radio::sendRequestRawResponse: serial %d", serial);
+ RLOGD("sendRequestRawResponse: serial %d", serial);
if (oemHookService[slotId]->mOemHookResponse != NULL) {
RadioResponseInfo responseInfo = {};
@@ -5729,7 +5716,7 @@
hidl_vec<uint8_t> data;
if (response == NULL) {
- RLOGE("radio::sendRequestRawResponse: Invalid response");
+ RLOGE("sendRequestRawResponse: Invalid response");
if (e == RIL_E_SUCCESS) responseInfo.error = RadioError::INVALID_RESPONSE;
} else {
data.setToExternal((uint8_t *) response, responseLen);
@@ -5738,17 +5725,17 @@
sendRequestRawResponse(responseInfo, data);
checkReturnStatus(slotId, retStatus);
} else {
- RLOGE("radio::sendRequestRawResponse: oemHookService[%d]->mOemHookResponse == NULL",
+ RLOGE("sendRequestRawResponse: oemHookService[%d]->mOemHookResponse == NULL",
slotId);
}
return 0;
}
-int radio::sendRequestStringsResponse(android::Parcel &p, int slotId, int requestNumber,
+int radio::sendRequestStringsResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responseLen) {
- RLOGD("radio::sendRequestStringsResponse: serial %d", serial);
+ RLOGD("sendRequestStringsResponse: serial %d", serial);
if (oemHookService[slotId]->mOemHookResponse != NULL) {
RadioResponseInfo responseInfo = {};
@@ -5756,7 +5743,7 @@
hidl_vec<hidl_string> data;
if (response == NULL || responseLen % sizeof(char *) != 0) {
- RLOGE("radio::sendRequestStringsResponse Invalid response: NULL");
+ RLOGE("sendRequestStringsResponse Invalid response: NULL");
if (e == RIL_E_SUCCESS) responseInfo.error = RadioError::INVALID_RESPONSE;
} else {
char **resp = (char **) response;
@@ -5771,7 +5758,7 @@
responseInfo, data);
checkReturnStatus(slotId, retStatus);
} else {
- RLOGE("radio::sendRequestStringsResponse: oemHookService[%d]->mOemHookResponse == "
+ RLOGE("sendRequestStringsResponse: oemHookService[%d]->mOemHookResponse == "
"NULL", slotId);
}
@@ -5785,47 +5772,47 @@
(RadioIndicationType::UNSOLICITED_ACK_EXP);
}
-int radio::radioStateChangedInd(android::Parcel &p, int slotId, int requestNumber,
+int radio::radioStateChangedInd(int slotId,
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);
+ RLOGD("radioStateChangedInd: radioState %d", radioState);
Return<void> retStatus = radioService[slotId]->mRadioIndication->radioStateChanged(
convertIntToRadioIndicationType(indicationType), radioState);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::radioStateChangedInd: radioService[%d]->mRadioIndication == NULL", slotId);
+ RLOGE("radioStateChangedInd: radioService[%d]->mRadioIndication == NULL", slotId);
}
return 0;
}
-int radio::callStateChangedInd(android::Parcel &p, int slotId, int requestNumber,
+int radio::callStateChangedInd(int slotId,
int indicationType, int token, RIL_Errno e, void *response,
size_t responseLen) {
if (radioService[slotId] != NULL && radioService[slotId]->mRadioIndication != NULL) {
- RLOGD("radio::callStateChangedInd");
+ RLOGD("callStateChangedInd");
Return<void> retStatus = radioService[slotId]->mRadioIndication->callStateChanged(
convertIntToRadioIndicationType(indicationType));
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::callStateChangedInd: radioService[%d]->mRadioIndication == NULL", slotId);
+ RLOGE("callStateChangedInd: radioService[%d]->mRadioIndication == NULL", slotId);
}
return 0;
}
-int radio::networkStateChangedInd(android::Parcel &p, int slotId, int requestNumber,
+int radio::networkStateChangedInd(int slotId,
int indicationType, int token, RIL_Errno e, void *response,
size_t responseLen) {
if (radioService[slotId] != NULL && radioService[slotId]->mRadioIndication != NULL) {
- RLOGD("radio::networkStateChangedInd");
+ RLOGD("networkStateChangedInd");
Return<void> retStatus = radioService[slotId]->mRadioIndication->networkStateChanged(
convertIntToRadioIndicationType(indicationType));
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::networkStateChangedInd: radioService[%d]->mRadioIndication == NULL",
+ RLOGE("networkStateChangedInd: radioService[%d]->mRadioIndication == NULL",
slotId);
}
@@ -5868,121 +5855,121 @@
return bytes;
}
-int radio::newSmsInd(android::Parcel &p, int slotId, int requestNumber, int indicationType,
+int radio::newSmsInd(int slotId, int indicationType,
int token, RIL_Errno e, void *response, size_t responseLen) {
if (radioService[slotId] != NULL && radioService[slotId]->mRadioIndication != NULL) {
if (response == NULL || responseLen == 0) {
- RLOGE("radio::newSmsInd: invalid response");
+ RLOGE("newSmsInd: invalid response");
return 0;
}
uint8_t *bytes = convertHexStringToBytes(response, responseLen);
if (bytes == NULL) {
- RLOGE("radio::newSmsInd: convertHexStringToBytes failed");
+ RLOGE("newSmsInd: convertHexStringToBytes failed");
return 0;
}
hidl_vec<uint8_t> pdu;
pdu.setToExternal(bytes, responseLen/2);
- RLOGD("radio::newSmsInd");
+ RLOGD("newSmsInd");
Return<void> retStatus = radioService[slotId]->mRadioIndication->newSms(
convertIntToRadioIndicationType(indicationType), pdu);
radioService[slotId]->checkReturnStatus(retStatus);
free(bytes);
} else {
- RLOGE("radio::newSmsInd: radioService[%d]->mRadioIndication == NULL", slotId);
+ RLOGE("newSmsInd: radioService[%d]->mRadioIndication == NULL", slotId);
}
return 0;
}
-int radio::newSmsStatusReportInd(android::Parcel &p, int slotId, int requestNumber,
+int radio::newSmsStatusReportInd(int slotId,
int indicationType, int token, RIL_Errno e, void *response,
size_t responseLen) {
if (radioService[slotId] != NULL && radioService[slotId]->mRadioIndication != NULL) {
if (response == NULL || responseLen == 0) {
- RLOGE("radio::newSmsStatusReportInd: invalid response");
+ RLOGE("newSmsStatusReportInd: invalid response");
return 0;
}
uint8_t *bytes = convertHexStringToBytes(response, responseLen);
if (bytes == NULL) {
- RLOGE("radio::newSmsStatusReportInd: convertHexStringToBytes failed");
+ RLOGE("newSmsStatusReportInd: convertHexStringToBytes failed");
return 0;
}
hidl_vec<uint8_t> pdu;
pdu.setToExternal(bytes, responseLen/2);
- RLOGD("radio::newSmsStatusReportInd");
+ RLOGD("newSmsStatusReportInd");
Return<void> retStatus = radioService[slotId]->mRadioIndication->newSmsStatusReport(
convertIntToRadioIndicationType(indicationType), pdu);
radioService[slotId]->checkReturnStatus(retStatus);
free(bytes);
} else {
- RLOGE("radio::newSmsStatusReportInd: radioService[%d]->mRadioIndication == NULL", slotId);
+ RLOGE("newSmsStatusReportInd: radioService[%d]->mRadioIndication == NULL", slotId);
}
return 0;
}
-int radio::newSmsOnSimInd(android::Parcel &p, int slotId, int requestNumber, int indicationType,
+int radio::newSmsOnSimInd(int slotId, int indicationType,
int token, RIL_Errno e, void *response, size_t responseLen) {
if (radioService[slotId] != NULL && radioService[slotId]->mRadioIndication != NULL) {
if (response == NULL || responseLen != sizeof(int)) {
- RLOGE("radio::newSmsOnSimInd: invalid response");
+ RLOGE("newSmsOnSimInd: invalid response");
return 0;
}
int32_t recordNumber = ((int32_t *) response)[0];
- RLOGD("radio::newSmsOnSimInd: slotIndex %d", recordNumber);
+ RLOGD("newSmsOnSimInd: slotIndex %d", recordNumber);
Return<void> retStatus = radioService[slotId]->mRadioIndication->newSmsOnSim(
convertIntToRadioIndicationType(indicationType), recordNumber);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::newSmsOnSimInd: radioService[%d]->mRadioIndication == NULL", slotId);
+ RLOGE("newSmsOnSimInd: radioService[%d]->mRadioIndication == NULL", slotId);
}
return 0;
}
-int radio::onUssdInd(android::Parcel &p, int slotId, int requestNumber, int indicationType,
+int radio::onUssdInd(int slotId, int indicationType,
int token, RIL_Errno e, void *response, size_t responseLen) {
if (radioService[slotId] != NULL && radioService[slotId]->mRadioIndication != NULL) {
if (response == NULL || responseLen != 2 * sizeof(char *)) {
- RLOGE("radio::onUssdInd: invalid response");
+ RLOGE("onUssdInd: invalid response");
return 0;
}
char **strings = (char **) response;
char *mode = strings[0];
hidl_string msg = convertCharPtrToHidlString(strings[1]);
UssdModeType modeType = (UssdModeType) atoi(mode);
- RLOGD("radio::onUssdInd: mode %s", mode);
+ RLOGD("onUssdInd: mode %s", mode);
Return<void> retStatus = radioService[slotId]->mRadioIndication->onUssd(
convertIntToRadioIndicationType(indicationType), modeType, msg);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::onUssdInd: radioService[%d]->mRadioIndication == NULL", slotId);
+ RLOGE("onUssdInd: radioService[%d]->mRadioIndication == NULL", slotId);
}
return 0;
}
-int radio::nitzTimeReceivedInd(android::Parcel &p, int slotId, int requestNumber,
+int radio::nitzTimeReceivedInd(int slotId,
int indicationType, int token, RIL_Errno e, void *response,
size_t responseLen) {
if (radioService[slotId] != NULL && radioService[slotId]->mRadioIndication != NULL) {
if (response == NULL || responseLen == 0) {
- RLOGE("radio::nitzTimeReceivedInd: invalid response");
+ RLOGE("nitzTimeReceivedInd: invalid response");
return 0;
}
hidl_string nitzTime = convertCharPtrToHidlString((char *) response);
int64_t timeReceived = android::elapsedRealtime();
- RLOGD("radio::nitzTimeReceivedInd: nitzTime %s receivedTime %" PRId64, nitzTime.c_str(),
+ RLOGD("nitzTimeReceivedInd: nitzTime %s receivedTime %" PRId64, nitzTime.c_str(),
timeReceived);
Return<void> retStatus = radioService[slotId]->mRadioIndication->nitzTimeReceived(
convertIntToRadioIndicationType(indicationType), nitzTime, timeReceived);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::nitzTimeReceivedInd: radioService[%d]->mRadioIndication == NULL", slotId);
+ RLOGE("nitzTimeReceivedInd: radioService[%d]->mRadioIndication == NULL", slotId);
return -1;
}
@@ -6032,24 +6019,24 @@
signalStrength.tdScdma.rscp = rilSignalStrength->TD_SCDMA_SignalStrength.rscp;
}
-int radio::currentSignalStrengthInd(android::Parcel &p, int slotId, int requestNumber,
+int radio::currentSignalStrengthInd(int slotId,
int indicationType, int token, RIL_Errno e,
void *response, size_t responseLen) {
if (radioService[slotId] != NULL && radioService[slotId]->mRadioIndication != NULL) {
if (response == NULL || responseLen != sizeof(RIL_SignalStrength_v10)) {
- RLOGE("radio::currentSignalStrengthInd: invalid response");
+ RLOGE("currentSignalStrengthInd: invalid response");
return 0;
}
SignalStrength signalStrength = {};
convertRilSignalStrengthToHal(response, responseLen, signalStrength);
- RLOGD("radio::currentSignalStrengthInd");
+ RLOGD("currentSignalStrengthInd");
Return<void> retStatus = radioService[slotId]->mRadioIndication->currentSignalStrength(
convertIntToRadioIndicationType(indicationType), signalStrength);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::currentSignalStrengthInd: radioService[%d]->mRadioIndication == NULL",
+ RLOGE("currentSignalStrengthInd: radioService[%d]->mRadioIndication == NULL",
slotId);
}
@@ -6082,32 +6069,32 @@
}
}
-int radio::dataCallListChangedInd(android::Parcel &p, int slotId, int requestNumber,
+int radio::dataCallListChangedInd(int slotId,
int indicationType, int token, RIL_Errno e, void *response,
size_t responseLen) {
if (radioService[slotId] != NULL && radioService[slotId]->mRadioIndication != NULL) {
if (response == NULL || responseLen % sizeof(RIL_Data_Call_Response_v11) != 0) {
- RLOGE("radio::dataCallListChangedInd: invalid response");
+ RLOGE("dataCallListChangedInd: invalid response");
return 0;
}
hidl_vec<SetupDataCallResult> dcList;
convertRilDataCallListToHal(response, responseLen, dcList);
- RLOGD("radio::dataCallListChangedInd");
+ RLOGD("dataCallListChangedInd");
Return<void> retStatus = radioService[slotId]->mRadioIndication->dataCallListChanged(
convertIntToRadioIndicationType(indicationType), dcList);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::dataCallListChangedInd: radioService[%d]->mRadioIndication == NULL", slotId);
+ RLOGE("dataCallListChangedInd: radioService[%d]->mRadioIndication == NULL", slotId);
}
return 0;
}
-int radio::suppSvcNotifyInd(android::Parcel &p, int slotId, int requestNumber, int indicationType,
+int radio::suppSvcNotifyInd(int slotId, int indicationType,
int token, RIL_Errno e, void *response, size_t responseLen) {
if (radioService[slotId] != NULL && radioService[slotId]->mRadioIndication != NULL) {
if (response == NULL || responseLen != sizeof(RIL_SuppSvcNotification)) {
- RLOGE("radio::suppSvcNotifyInd: invalid response");
+ RLOGE("suppSvcNotifyInd: invalid response");
return 0;
}
@@ -6119,110 +6106,110 @@
suppSvc.type = ssn->type;
suppSvc.number = convertCharPtrToHidlString(ssn->number);
- RLOGD("radio::suppSvcNotifyInd: isMT %d code %d index %d type %d",
+ RLOGD("suppSvcNotifyInd: isMT %d code %d index %d type %d",
suppSvc.isMT, suppSvc.code, suppSvc.index, suppSvc.type);
Return<void> retStatus = radioService[slotId]->mRadioIndication->suppSvcNotify(
convertIntToRadioIndicationType(indicationType), suppSvc);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::suppSvcNotifyInd: radioService[%d]->mRadioIndication == NULL", slotId);
+ RLOGE("suppSvcNotifyInd: radioService[%d]->mRadioIndication == NULL", slotId);
}
return 0;
}
-int radio::stkSessionEndInd(android::Parcel &p, int slotId, int requestNumber, int indicationType,
+int radio::stkSessionEndInd(int slotId, int indicationType,
int token, RIL_Errno e, void *response, size_t responseLen) {
if (radioService[slotId] != NULL && radioService[slotId]->mRadioIndication != NULL) {
- RLOGD("radio::stkSessionEndInd");
+ RLOGD("stkSessionEndInd");
Return<void> retStatus = radioService[slotId]->mRadioIndication->stkSessionEnd(
convertIntToRadioIndicationType(indicationType));
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::stkSessionEndInd: radioService[%d]->mRadioIndication == NULL", slotId);
+ RLOGE("stkSessionEndInd: radioService[%d]->mRadioIndication == NULL", slotId);
}
return 0;
}
-int radio::stkProactiveCommandInd(android::Parcel &p, int slotId, int requestNumber,
+int radio::stkProactiveCommandInd(int slotId,
int indicationType, int token, RIL_Errno e, void *response,
size_t responseLen) {
if (radioService[slotId] != NULL && radioService[slotId]->mRadioIndication != NULL) {
if (response == NULL || responseLen == 0) {
- RLOGE("radio::stkProactiveCommandInd: invalid response");
+ RLOGE("stkProactiveCommandInd: invalid response");
return 0;
}
- RLOGD("radio::stkProactiveCommandInd");
+ RLOGD("stkProactiveCommandInd");
Return<void> retStatus = radioService[slotId]->mRadioIndication->stkProactiveCommand(
convertIntToRadioIndicationType(indicationType),
convertCharPtrToHidlString((char *) response));
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::stkProactiveCommandInd: radioService[%d]->mRadioIndication == NULL", slotId);
+ RLOGE("stkProactiveCommandInd: radioService[%d]->mRadioIndication == NULL", slotId);
}
return 0;
}
-int radio::stkEventNotifyInd(android::Parcel &p, int slotId, int requestNumber, int indicationType,
+int radio::stkEventNotifyInd(int slotId, int indicationType,
int token, RIL_Errno e, void *response, size_t responseLen) {
if (radioService[slotId] != NULL && radioService[slotId]->mRadioIndication != NULL) {
if (response == NULL || responseLen == 0) {
- RLOGE("radio::stkEventNotifyInd: invalid response");
+ RLOGE("stkEventNotifyInd: invalid response");
return 0;
}
- RLOGD("radio::stkEventNotifyInd");
+ RLOGD("stkEventNotifyInd");
Return<void> retStatus = radioService[slotId]->mRadioIndication->stkEventNotify(
convertIntToRadioIndicationType(indicationType),
convertCharPtrToHidlString((char *) response));
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::stkEventNotifyInd: radioService[%d]->mRadioIndication == NULL", slotId);
+ RLOGE("stkEventNotifyInd: radioService[%d]->mRadioIndication == NULL", slotId);
}
return 0;
}
-int radio::stkCallSetupInd(android::Parcel &p, int slotId, int requestNumber, int indicationType,
+int radio::stkCallSetupInd(int slotId, int indicationType,
int token, RIL_Errno e, void *response, size_t responseLen) {
if (radioService[slotId] != NULL && radioService[slotId]->mRadioIndication != NULL) {
if (response == NULL || responseLen != sizeof(int)) {
- RLOGE("radio::stkCallSetupInd: invalid response");
+ RLOGE("stkCallSetupInd: invalid response");
return 0;
}
int32_t timeout = ((int32_t *) response)[0];
- RLOGD("radio::stkCallSetupInd: timeout %d", timeout);
+ RLOGD("stkCallSetupInd: timeout %d", timeout);
Return<void> retStatus = radioService[slotId]->mRadioIndication->stkCallSetup(
convertIntToRadioIndicationType(indicationType), timeout);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::stkCallSetupInd: radioService[%d]->mRadioIndication == NULL", slotId);
+ RLOGE("stkCallSetupInd: radioService[%d]->mRadioIndication == NULL", slotId);
}
return 0;
}
-int radio::simSmsStorageFullInd(android::Parcel &p, int slotId, int requestNumber,
+int radio::simSmsStorageFullInd(int slotId,
int indicationType, int token, RIL_Errno e, void *response,
size_t responseLen) {
if (radioService[slotId] != NULL && radioService[slotId]->mRadioIndication != NULL) {
- RLOGD("radio::simSmsStorageFullInd");
+ RLOGD("simSmsStorageFullInd");
Return<void> retStatus = radioService[slotId]->mRadioIndication->simSmsStorageFull(
convertIntToRadioIndicationType(indicationType));
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::simSmsStorageFullInd: radioService[%d]->mRadioIndication == NULL", slotId);
+ RLOGE("simSmsStorageFullInd: radioService[%d]->mRadioIndication == NULL", slotId);
}
return 0;
}
-int radio::simRefreshInd(android::Parcel &p, int slotId, int requestNumber, int indicationType,
+int radio::simRefreshInd(int slotId, int indicationType,
int token, RIL_Errno e, void *response, size_t responseLen) {
if (radioService[slotId] != NULL && radioService[slotId]->mRadioIndication != NULL) {
if (response == NULL || responseLen != sizeof(RIL_SimRefreshResponse_v7)) {
- RLOGE("radio::simRefreshInd: invalid response");
+ RLOGE("simRefreshInd: invalid response");
return 0;
}
@@ -6233,12 +6220,12 @@
refreshResult.efId = simRefreshResponse->ef_id;
refreshResult.aid = convertCharPtrToHidlString(simRefreshResponse->aid);
- RLOGD("radio::simRefreshInd: type %d efId %d", refreshResult.type, refreshResult.efId);
+ RLOGD("simRefreshInd: type %d efId %d", refreshResult.type, refreshResult.efId);
Return<void> retStatus = radioService[slotId]->mRadioIndication->simRefresh(
convertIntToRadioIndicationType(indicationType), refreshResult);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::simRefreshInd: radioService[%d]->mRadioIndication == NULL", slotId);
+ RLOGE("simRefreshInd: radioService[%d]->mRadioIndication == NULL", slotId);
}
return 0;
@@ -6252,7 +6239,7 @@
record.signal = signalInfoRecord->signal;
}
-int radio::callRingInd(android::Parcel &p, int slotId, int requestNumber, int indicationType,
+int radio::callRingInd(int slotId, int indicationType,
int token, RIL_Errno e, void *response, size_t responseLen) {
if (radioService[slotId] != NULL && radioService[slotId]->mRadioIndication != NULL) {
bool isGsm;
@@ -6262,43 +6249,43 @@
} else {
isGsm = false;
if (responseLen != sizeof (RIL_CDMA_SignalInfoRecord)) {
- RLOGE("radio::callRingInd: invalid response");
+ RLOGE("callRingInd: invalid response");
return 0;
}
convertRilCdmaSignalInfoRecordToHal((RIL_CDMA_SignalInfoRecord *) response, record);
}
- RLOGD("radio::callRingInd: isGsm %d", isGsm);
+ RLOGD("callRingInd: isGsm %d", isGsm);
Return<void> retStatus = radioService[slotId]->mRadioIndication->callRing(
convertIntToRadioIndicationType(indicationType), isGsm, record);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::callRingInd: radioService[%d]->mRadioIndication == NULL", slotId);
+ RLOGE("callRingInd: radioService[%d]->mRadioIndication == NULL", slotId);
}
return 0;
}
-int radio::simStatusChangedInd(android::Parcel &p, int slotId, int requestNumber,
+int radio::simStatusChangedInd(int slotId,
int indicationType, int token, RIL_Errno e, void *response,
size_t responseLen) {
if (radioService[slotId] != NULL && radioService[slotId]->mRadioIndication != NULL) {
- RLOGD("radio::simStatusChangedInd");
+ RLOGD("simStatusChangedInd");
Return<void> retStatus = radioService[slotId]->mRadioIndication->simStatusChanged(
convertIntToRadioIndicationType(indicationType));
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::simStatusChangedInd: radioService[%d]->mRadioIndication == NULL", slotId);
+ RLOGE("simStatusChangedInd: radioService[%d]->mRadioIndication == NULL", slotId);
}
return 0;
}
-int radio::cdmaNewSmsInd(android::Parcel &p, int slotId, int requestNumber, int indicationType,
+int radio::cdmaNewSmsInd(int slotId, int indicationType,
int token, RIL_Errno e, void *response, size_t responseLen) {
if (radioService[slotId] != NULL && radioService[slotId]->mRadioIndication != NULL) {
if (response == NULL || responseLen != sizeof(RIL_CDMA_SMS_Message)) {
- RLOGE("radio::cdmaNewSmsInd: invalid response");
+ RLOGE("cdmaNewSmsInd: invalid response");
return 0;
}
@@ -6329,98 +6316,98 @@
digitLimit = MIN((rilMsg->uBearerDataLen), RIL_CDMA_SMS_BEARER_DATA_MAX);
msg.bearerData.setToExternal(rilMsg->aBearerData, digitLimit);
- RLOGD("radio::cdmaNewSmsInd");
+ RLOGD("cdmaNewSmsInd");
Return<void> retStatus = radioService[slotId]->mRadioIndication->cdmaNewSms(
convertIntToRadioIndicationType(indicationType), msg);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::cdmaNewSmsInd: radioService[%d]->mRadioIndication == NULL", slotId);
+ RLOGE("cdmaNewSmsInd: radioService[%d]->mRadioIndication == NULL", slotId);
}
return 0;
}
-int radio::newBroadcastSmsInd(android::Parcel &p, int slotId, int requestNumber,
+int radio::newBroadcastSmsInd(int slotId,
int indicationType, int token, RIL_Errno e, void *response,
size_t responseLen) {
if (radioService[slotId] != NULL && radioService[slotId]->mRadioIndication != NULL) {
if (response == NULL || responseLen == 0) {
- RLOGE("radio::newBroadcastSmsInd: invalid response");
+ RLOGE("newBroadcastSmsInd: invalid response");
return 0;
}
hidl_vec<uint8_t> data;
data.setToExternal((uint8_t *) response, responseLen);
- RLOGD("radio::newBroadcastSmsInd");
+ RLOGD("newBroadcastSmsInd");
Return<void> retStatus = radioService[slotId]->mRadioIndication->newBroadcastSms(
convertIntToRadioIndicationType(indicationType), data);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::newBroadcastSmsInd: radioService[%d]->mRadioIndication == NULL", slotId);
+ RLOGE("newBroadcastSmsInd: radioService[%d]->mRadioIndication == NULL", slotId);
}
return 0;
}
-int radio::cdmaRuimSmsStorageFullInd(android::Parcel &p, int slotId, int requestNumber,
+int radio::cdmaRuimSmsStorageFullInd(int slotId,
int indicationType, int token, RIL_Errno e, void *response,
size_t responseLen) {
if (radioService[slotId] != NULL && radioService[slotId]->mRadioIndication != NULL) {
- RLOGD("radio::cdmaRuimSmsStorageFullInd");
+ RLOGD("cdmaRuimSmsStorageFullInd");
Return<void> retStatus = radioService[slotId]->mRadioIndication->cdmaRuimSmsStorageFull(
convertIntToRadioIndicationType(indicationType));
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::cdmaRuimSmsStorageFullInd: radioService[%d]->mRadioIndication == NULL",
+ RLOGE("cdmaRuimSmsStorageFullInd: radioService[%d]->mRadioIndication == NULL",
slotId);
}
return 0;
}
-int radio::restrictedStateChangedInd(android::Parcel &p, int slotId, int requestNumber,
+int radio::restrictedStateChangedInd(int slotId,
int indicationType, int token, RIL_Errno e, void *response,
size_t responseLen) {
if (radioService[slotId] != NULL && radioService[slotId]->mRadioIndication != NULL) {
if (response == NULL || responseLen != sizeof(int)) {
- RLOGE("radio::restrictedStateChangedInd: invalid response");
+ RLOGE("restrictedStateChangedInd: invalid response");
return 0;
}
int32_t state = ((int32_t *) response)[0];
- RLOGD("radio::restrictedStateChangedInd: state %d", state);
+ RLOGD("restrictedStateChangedInd: state %d", state);
Return<void> retStatus = radioService[slotId]->mRadioIndication->restrictedStateChanged(
convertIntToRadioIndicationType(indicationType), (PhoneRestrictedState) state);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::restrictedStateChangedInd: radioService[%d]->mRadioIndication == NULL",
+ RLOGE("restrictedStateChangedInd: radioService[%d]->mRadioIndication == NULL",
slotId);
}
return 0;
}
-int radio::enterEmergencyCallbackModeInd(android::Parcel &p, int slotId, int requestNumber,
+int radio::enterEmergencyCallbackModeInd(int slotId,
int indicationType, int token, RIL_Errno e, void *response,
size_t responseLen) {
if (radioService[slotId] != NULL && radioService[slotId]->mRadioIndication != NULL) {
- RLOGD("radio::enterEmergencyCallbackModeInd");
+ RLOGD("enterEmergencyCallbackModeInd");
Return<void> retStatus = radioService[slotId]->mRadioIndication->enterEmergencyCallbackMode(
convertIntToRadioIndicationType(indicationType));
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::enterEmergencyCallbackModeInd: radioService[%d]->mRadioIndication == NULL",
+ RLOGE("enterEmergencyCallbackModeInd: radioService[%d]->mRadioIndication == NULL",
slotId);
}
return 0;
}
-int radio::cdmaCallWaitingInd(android::Parcel &p, int slotId, int requestNumber,
+int radio::cdmaCallWaitingInd(int slotId,
int indicationType, int token, RIL_Errno e, void *response,
size_t responseLen) {
if (radioService[slotId] != NULL && radioService[slotId]->mRadioIndication != NULL) {
if (response == NULL || responseLen != sizeof(RIL_CDMA_CallWaiting_v6)) {
- RLOGE("radio::cdmaCallWaitingInd: invalid response");
+ RLOGE("cdmaCallWaitingInd: invalid response");
return 0;
}
@@ -6435,44 +6422,44 @@
callWaitingRecord.numberType = (CdmaCallWaitingNumberType) callWaitingRil->number_type;
callWaitingRecord.numberPlan = (CdmaCallWaitingNumberPlan) callWaitingRil->number_plan;
- RLOGD("radio::cdmaCallWaitingInd");
+ RLOGD("cdmaCallWaitingInd");
Return<void> retStatus = radioService[slotId]->mRadioIndication->cdmaCallWaiting(
convertIntToRadioIndicationType(indicationType), callWaitingRecord);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::cdmaCallWaitingInd: radioService[%d]->mRadioIndication == NULL", slotId);
+ RLOGE("cdmaCallWaitingInd: radioService[%d]->mRadioIndication == NULL", slotId);
}
return 0;
}
-int radio::cdmaOtaProvisionStatusInd(android::Parcel &p, int slotId, int requestNumber,
+int radio::cdmaOtaProvisionStatusInd(int slotId,
int indicationType, int token, RIL_Errno e, void *response,
size_t responseLen) {
if (radioService[slotId] != NULL && radioService[slotId]->mRadioIndication != NULL) {
if (response == NULL || responseLen != sizeof(int)) {
- RLOGE("radio::cdmaOtaProvisionStatusInd: invalid response");
+ RLOGE("cdmaOtaProvisionStatusInd: invalid response");
return 0;
}
int32_t status = ((int32_t *) response)[0];
- RLOGD("radio::cdmaOtaProvisionStatusInd: status %d", status);
+ RLOGD("cdmaOtaProvisionStatusInd: status %d", status);
Return<void> retStatus = radioService[slotId]->mRadioIndication->cdmaOtaProvisionStatus(
convertIntToRadioIndicationType(indicationType), (CdmaOtaProvisionStatus) status);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::cdmaOtaProvisionStatusInd: radioService[%d]->mRadioIndication == NULL",
+ RLOGE("cdmaOtaProvisionStatusInd: radioService[%d]->mRadioIndication == NULL",
slotId);
}
return 0;
}
-int radio::cdmaInfoRecInd(android::Parcel &p, int slotId, int requestNumber,
+int radio::cdmaInfoRecInd(int slotId,
int indicationType, int token, RIL_Errno e, void *response,
size_t responseLen) {
if (radioService[slotId] != NULL && radioService[slotId]->mRadioIndication != NULL) {
if (response == NULL || responseLen != sizeof(RIL_CDMA_InformationRecords)) {
- RLOGE("radio::cdmaInfoRecInd: invalid response");
+ RLOGE("cdmaInfoRecInd: invalid response");
return 0;
}
@@ -6482,7 +6469,7 @@
char* string8 = NULL;
int num = MIN(recordsRil->numberOfInfoRecs, RIL_CDMA_MAX_NUMBER_OF_INFO_RECS);
if (recordsRil->numberOfInfoRecs > RIL_CDMA_MAX_NUMBER_OF_INFO_RECS) {
- RLOGE("radio::cdmaInfoRecInd: received %d recs which is more than %d, dropping "
+ RLOGE("cdmaInfoRecInd: received %d recs which is more than %d, dropping "
"additional ones", recordsRil->numberOfInfoRecs,
RIL_CDMA_MAX_NUMBER_OF_INFO_RECS);
}
@@ -6504,14 +6491,14 @@
case RIL_CDMA_DISPLAY_INFO_REC:
case RIL_CDMA_EXTENDED_DISPLAY_INFO_REC: {
if (infoRec->rec.display.alpha_len > CDMA_ALPHA_INFO_BUFFER_LENGTH) {
- RLOGE("radio::cdmaInfoRecInd: invalid display info response length %d "
+ RLOGE("cdmaInfoRecInd: invalid display info response length %d "
"expected not more than %d", (int) infoRec->rec.display.alpha_len,
CDMA_ALPHA_INFO_BUFFER_LENGTH);
return 0;
}
string8 = (char*) malloc((infoRec->rec.display.alpha_len + 1) * sizeof(char));
if (string8 == NULL) {
- RLOGE("radio::cdmaInfoRecInd: Memory allocation failed for "
+ RLOGE("cdmaInfoRecInd: Memory allocation failed for "
"responseCdmaInformationRecords");
return 0;
}
@@ -6529,14 +6516,14 @@
case RIL_CDMA_CALLING_PARTY_NUMBER_INFO_REC:
case RIL_CDMA_CONNECTED_NUMBER_INFO_REC: {
if (infoRec->rec.number.len > CDMA_NUMBER_INFO_BUFFER_LENGTH) {
- RLOGE("radio::cdmaInfoRecInd: invalid display info response length %d "
+ RLOGE("cdmaInfoRecInd: invalid display info response length %d "
"expected not more than %d", (int) infoRec->rec.number.len,
CDMA_NUMBER_INFO_BUFFER_LENGTH);
return 0;
}
string8 = (char*) malloc((infoRec->rec.number.len + 1) * sizeof(char));
if (string8 == NULL) {
- RLOGE("radio::cdmaInfoRecInd: Memory allocation failed for "
+ RLOGE("cdmaInfoRecInd: Memory allocation failed for "
"responseCdmaInformationRecords");
return 0;
}
@@ -6566,7 +6553,7 @@
case RIL_CDMA_REDIRECTING_NUMBER_INFO_REC: {
if (infoRec->rec.redir.redirectingNumber.len >
CDMA_NUMBER_INFO_BUFFER_LENGTH) {
- RLOGE("radio::cdmaInfoRecInd: invalid display info response length %d "
+ RLOGE("cdmaInfoRecInd: invalid display info response length %d "
"expected not more than %d\n",
(int)infoRec->rec.redir.redirectingNumber.len,
CDMA_NUMBER_INFO_BUFFER_LENGTH);
@@ -6575,7 +6562,7 @@
string8 = (char*) malloc((infoRec->rec.redir.redirectingNumber.len + 1) *
sizeof(char));
if (string8 == NULL) {
- RLOGE("radio::cdmaInfoRecInd: Memory allocation failed for "
+ RLOGE("cdmaInfoRecInd: Memory allocation failed for "
"responseCdmaInformationRecords");
return 0;
}
@@ -6623,149 +6610,149 @@
}
case RIL_CDMA_T53_RELEASE_INFO_REC:
- RLOGE("radio::cdmaInfoRecInd: RIL_CDMA_T53_RELEASE_INFO_REC: INVALID");
+ RLOGE("cdmaInfoRecInd: RIL_CDMA_T53_RELEASE_INFO_REC: INVALID");
return 0;
default:
- RLOGE("radio::cdmaInfoRecInd: Incorrect name value");
+ RLOGE("cdmaInfoRecInd: Incorrect name value");
return 0;
}
}
- RLOGD("radio::cdmaInfoRecInd");
+ RLOGD("cdmaInfoRecInd");
Return<void> retStatus = radioService[slotId]->mRadioIndication->cdmaInfoRec(
convertIntToRadioIndicationType(indicationType), records);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::cdmaInfoRecInd: radioService[%d]->mRadioIndication == NULL", slotId);
+ RLOGE("cdmaInfoRecInd: radioService[%d]->mRadioIndication == NULL", slotId);
}
return 0;
}
-int radio::indicateRingbackToneInd(android::Parcel &p, int slotId, int requestNumber,
+int radio::indicateRingbackToneInd(int slotId,
int indicationType, int token, RIL_Errno e, void *response,
size_t responseLen) {
if (radioService[slotId] != NULL && radioService[slotId]->mRadioIndication != NULL) {
if (response == NULL || responseLen != sizeof(int)) {
- RLOGE("radio::indicateRingbackToneInd: invalid response");
+ RLOGE("indicateRingbackToneInd: invalid response");
return 0;
}
bool start = ((int32_t *) response)[0];
- RLOGD("radio::indicateRingbackToneInd: start %d", start);
+ RLOGD("indicateRingbackToneInd: start %d", start);
Return<void> retStatus = radioService[slotId]->mRadioIndication->indicateRingbackTone(
convertIntToRadioIndicationType(indicationType), start);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::indicateRingbackToneInd: radioService[%d]->mRadioIndication == NULL", slotId);
+ RLOGE("indicateRingbackToneInd: radioService[%d]->mRadioIndication == NULL", slotId);
}
return 0;
}
-int radio::resendIncallMuteInd(android::Parcel &p, int slotId, int requestNumber,
+int radio::resendIncallMuteInd(int slotId,
int indicationType, int token, RIL_Errno e, void *response,
size_t responseLen) {
if (radioService[slotId] != NULL && radioService[slotId]->mRadioIndication != NULL) {
- RLOGD("radio::resendIncallMuteInd");
+ RLOGD("resendIncallMuteInd");
Return<void> retStatus = radioService[slotId]->mRadioIndication->resendIncallMute(
convertIntToRadioIndicationType(indicationType));
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::resendIncallMuteInd: radioService[%d]->mRadioIndication == NULL", slotId);
+ RLOGE("resendIncallMuteInd: radioService[%d]->mRadioIndication == NULL", slotId);
}
return 0;
}
-int radio::cdmaSubscriptionSourceChangedInd(android::Parcel &p, int slotId, int requestNumber,
+int radio::cdmaSubscriptionSourceChangedInd(int slotId,
int indicationType, int token, RIL_Errno e,
void *response, size_t responseLen) {
if (radioService[slotId] != NULL && radioService[slotId]->mRadioIndication != NULL) {
if (response == NULL || responseLen != sizeof(int)) {
- RLOGE("radio::cdmaSubscriptionSourceChangedInd: invalid response");
+ RLOGE("cdmaSubscriptionSourceChangedInd: invalid response");
return 0;
}
int32_t cdmaSource = ((int32_t *) response)[0];
- RLOGD("radio::cdmaSubscriptionSourceChangedInd: cdmaSource %d", cdmaSource);
+ RLOGD("cdmaSubscriptionSourceChangedInd: cdmaSource %d", cdmaSource);
Return<void> retStatus = radioService[slotId]->mRadioIndication->
cdmaSubscriptionSourceChanged(convertIntToRadioIndicationType(indicationType),
(CdmaSubscriptionSource) cdmaSource);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::cdmaSubscriptionSourceChangedInd: radioService[%d]->mRadioIndication == NULL",
+ RLOGE("cdmaSubscriptionSourceChangedInd: radioService[%d]->mRadioIndication == NULL",
slotId);
}
return 0;
}
-int radio::cdmaPrlChangedInd(android::Parcel &p, int slotId, int requestNumber,
+int radio::cdmaPrlChangedInd(int slotId,
int indicationType, int token, RIL_Errno e, void *response,
size_t responseLen) {
if (radioService[slotId] != NULL && radioService[slotId]->mRadioIndication != NULL) {
if (response == NULL || responseLen != sizeof(int)) {
- RLOGE("radio::cdmaPrlChangedInd: invalid response");
+ RLOGE("cdmaPrlChangedInd: invalid response");
return 0;
}
int32_t version = ((int32_t *) response)[0];
- RLOGD("radio::cdmaPrlChangedInd: version %d", version);
+ RLOGD("cdmaPrlChangedInd: version %d", version);
Return<void> retStatus = radioService[slotId]->mRadioIndication->cdmaPrlChanged(
convertIntToRadioIndicationType(indicationType), version);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::cdmaPrlChangedInd: radioService[%d]->mRadioIndication == NULL", slotId);
+ RLOGE("cdmaPrlChangedInd: radioService[%d]->mRadioIndication == NULL", slotId);
}
return 0;
}
-int radio::exitEmergencyCallbackModeInd(android::Parcel &p, int slotId, int requestNumber,
+int radio::exitEmergencyCallbackModeInd(int slotId,
int indicationType, int token, RIL_Errno e, void *response,
size_t responseLen) {
if (radioService[slotId] != NULL && radioService[slotId]->mRadioIndication != NULL) {
- RLOGD("radio::exitEmergencyCallbackModeInd");
+ RLOGD("exitEmergencyCallbackModeInd");
Return<void> retStatus = radioService[slotId]->mRadioIndication->exitEmergencyCallbackMode(
convertIntToRadioIndicationType(indicationType));
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::exitEmergencyCallbackModeInd: radioService[%d]->mRadioIndication == NULL",
+ RLOGE("exitEmergencyCallbackModeInd: radioService[%d]->mRadioIndication == NULL",
slotId);
}
return 0;
}
-int radio::rilConnectedInd(android::Parcel &p, int slotId, int requestNumber,
+int radio::rilConnectedInd(int slotId,
int indicationType, int token, RIL_Errno e, void *response,
size_t responseLen) {
if (radioService[slotId] != NULL && radioService[slotId]->mRadioIndication != NULL) {
- RLOGD("radio::rilConnectedInd");
+ RLOGD("rilConnectedInd");
Return<void> retStatus = radioService[slotId]->mRadioIndication->rilConnected(
convertIntToRadioIndicationType(indicationType));
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::rilConnectedInd: radioService[%d]->mRadioIndication == NULL", slotId);
+ RLOGE("rilConnectedInd: radioService[%d]->mRadioIndication == NULL", slotId);
}
return 0;
}
-int radio::voiceRadioTechChangedInd(android::Parcel &p, int slotId, int requestNumber,
+int radio::voiceRadioTechChangedInd(int slotId,
int indicationType, int token, RIL_Errno e, void *response,
size_t responseLen) {
if (radioService[slotId] != NULL && radioService[slotId]->mRadioIndication != NULL) {
if (response == NULL || responseLen != sizeof(int)) {
- RLOGE("radio::voiceRadioTechChangedInd: invalid response");
+ RLOGE("voiceRadioTechChangedInd: invalid response");
return 0;
}
int32_t rat = ((int32_t *) response)[0];
- RLOGD("radio::voiceRadioTechChangedInd: rat %d", rat);
+ RLOGD("voiceRadioTechChangedInd: rat %d", rat);
Return<void> retStatus = radioService[slotId]->mRadioIndication->voiceRadioTechChanged(
convertIntToRadioIndicationType(indicationType), (RadioTechnology) rat);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::voiceRadioTechChangedInd: radioService[%d]->mRadioIndication == NULL",
+ RLOGE("voiceRadioTechChangedInd: radioService[%d]->mRadioIndication == NULL",
slotId);
}
@@ -6917,81 +6904,81 @@
}
}
-int radio::cellInfoListInd(android::Parcel &p, int slotId, int requestNumber,
+int radio::cellInfoListInd(int slotId,
int indicationType, int token, RIL_Errno e, void *response,
size_t responseLen) {
if (radioService[slotId] != NULL && radioService[slotId]->mRadioIndication != NULL) {
if (response == NULL || responseLen % sizeof(RIL_CellInfo_v12) != 0) {
- RLOGE("radio::cellInfoListInd: invalid response");
+ RLOGE("cellInfoListInd: invalid response");
return 0;
}
hidl_vec<CellInfo> records;
convertRilCellInfoListToHal(response, responseLen, records);
- RLOGD("radio::cellInfoListInd");
+ RLOGD("cellInfoListInd");
Return<void> retStatus = radioService[slotId]->mRadioIndication->cellInfoList(
convertIntToRadioIndicationType(indicationType), records);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::cellInfoListInd: radioService[%d]->mRadioIndication == NULL", slotId);
+ RLOGE("cellInfoListInd: radioService[%d]->mRadioIndication == NULL", slotId);
}
return 0;
}
-int radio::imsNetworkStateChangedInd(android::Parcel &p, int slotId, int requestNumber,
+int radio::imsNetworkStateChangedInd(int slotId,
int indicationType, int token, RIL_Errno e, void *response,
size_t responseLen) {
if (radioService[slotId] != NULL && radioService[slotId]->mRadioIndication != NULL) {
- RLOGD("radio::imsNetworkStateChangedInd");
+ RLOGD("imsNetworkStateChangedInd");
Return<void> retStatus = radioService[slotId]->mRadioIndication->imsNetworkStateChanged(
convertIntToRadioIndicationType(indicationType));
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::imsNetworkStateChangedInd: radioService[%d]->mRadioIndication == NULL",
+ RLOGE("imsNetworkStateChangedInd: radioService[%d]->mRadioIndication == NULL",
slotId);
}
return 0;
}
-int radio::subscriptionStatusChangedInd(android::Parcel &p, int slotId, int requestNumber,
+int radio::subscriptionStatusChangedInd(int slotId,
int indicationType, int token, RIL_Errno e, void *response,
size_t responseLen) {
if (radioService[slotId] != NULL && radioService[slotId]->mRadioIndication != NULL) {
if (response == NULL || responseLen != sizeof(int)) {
- RLOGE("radio::subscriptionStatusChangedInd: invalid response");
+ RLOGE("subscriptionStatusChangedInd: invalid response");
return 0;
}
bool activate = ((int32_t *) response)[0];
- RLOGD("radio::subscriptionStatusChangedInd: activate %d", activate);
+ RLOGD("subscriptionStatusChangedInd: activate %d", activate);
Return<void> retStatus = radioService[slotId]->mRadioIndication->subscriptionStatusChanged(
convertIntToRadioIndicationType(indicationType), activate);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::subscriptionStatusChangedInd: radioService[%d]->mRadioIndication == NULL",
+ RLOGE("subscriptionStatusChangedInd: radioService[%d]->mRadioIndication == NULL",
slotId);
}
return 0;
}
-int radio::srvccStateNotifyInd(android::Parcel &p, int slotId, int requestNumber,
+int radio::srvccStateNotifyInd(int slotId,
int indicationType, int token, RIL_Errno e, void *response,
size_t responseLen) {
if (radioService[slotId] != NULL && radioService[slotId]->mRadioIndication != NULL) {
if (response == NULL || responseLen != sizeof(int)) {
- RLOGE("radio::srvccStateNotifyInd: invalid response");
+ RLOGE("srvccStateNotifyInd: invalid response");
return 0;
}
int32_t state = ((int32_t *) response)[0];
- RLOGD("radio::srvccStateNotifyInd: rat %d", state);
+ RLOGD("srvccStateNotifyInd: rat %d", state);
Return<void> retStatus = radioService[slotId]->mRadioIndication->srvccStateNotify(
convertIntToRadioIndicationType(indicationType), (SrvccState) state);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::srvccStateNotifyInd: radioService[%d]->mRadioIndication == NULL", slotId);
+ RLOGE("srvccStateNotifyInd: radioService[%d]->mRadioIndication == NULL", slotId);
}
return 0;
@@ -7030,24 +7017,24 @@
}
}
-int radio::hardwareConfigChangedInd(android::Parcel &p, int slotId, int requestNumber,
+int radio::hardwareConfigChangedInd(int slotId,
int indicationType, int token, RIL_Errno e, void *response,
size_t responseLen) {
if (radioService[slotId] != NULL && radioService[slotId]->mRadioIndication != NULL) {
if (response == NULL || responseLen % sizeof(RIL_HardwareConfig) != 0) {
- RLOGE("radio::hardwareConfigChangedInd: invalid response");
+ RLOGE("hardwareConfigChangedInd: invalid response");
return 0;
}
hidl_vec<HardwareConfig> configs;
convertRilHardwareConfigListToHal(response, responseLen, configs);
- RLOGD("radio::hardwareConfigChangedInd");
+ RLOGD("hardwareConfigChangedInd");
Return<void> retStatus = radioService[slotId]->mRadioIndication->hardwareConfigChanged(
convertIntToRadioIndicationType(indicationType), configs);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::hardwareConfigChangedInd: radioService[%d]->mRadioIndication == NULL",
+ RLOGE("hardwareConfigChangedInd: radioService[%d]->mRadioIndication == NULL",
slotId);
}
@@ -7063,24 +7050,24 @@
rc.status = (android::hardware::radio::V1_0::RadioCapabilityStatus) rilRadioCapability->status;
}
-int radio::radioCapabilityIndicationInd(android::Parcel &p, int slotId, int requestNumber,
+int radio::radioCapabilityIndicationInd(int slotId,
int indicationType, int token, RIL_Errno e, void *response,
size_t responseLen) {
if (radioService[slotId] != NULL && radioService[slotId]->mRadioIndication != NULL) {
if (response == NULL || responseLen != sizeof(RIL_RadioCapability)) {
- RLOGE("radio::radioCapabilityIndicationInd: invalid response");
+ RLOGE("radioCapabilityIndicationInd: invalid response");
return 0;
}
RadioCapability rc = {};
convertRilRadioCapabilityToHal(response, responseLen, rc);
- RLOGD("radio::radioCapabilityIndicationInd");
+ RLOGD("radioCapabilityIndicationInd");
Return<void> retStatus = radioService[slotId]->mRadioIndication->radioCapabilityIndication(
convertIntToRadioIndicationType(indicationType), rc);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::radioCapabilityIndicationInd: radioService[%d]->mRadioIndication == NULL",
+ RLOGE("radioCapabilityIndicationInd: radioService[%d]->mRadioIndication == NULL",
slotId);
}
@@ -7100,12 +7087,12 @@
return false;
}
-int radio::onSupplementaryServiceIndicationInd(android::Parcel &p, int slotId, int requestNumber,
+int radio::onSupplementaryServiceIndicationInd(int slotId,
int indicationType, int token, RIL_Errno e,
void *response, size_t responseLen) {
if (radioService[slotId] != NULL && radioService[slotId]->mRadioIndication != NULL) {
if (response == NULL || responseLen != sizeof(RIL_StkCcUnsolSsResponse)) {
- RLOGE("radio::onSupplementaryServiceIndicationInd: invalid response");
+ RLOGE("onSupplementaryServiceIndicationInd: invalid response");
return 0;
}
@@ -7118,10 +7105,10 @@
ss.result = (RadioError) rilSsResponse->result;
if (isServiceTypeCfQuery(rilSsResponse->serviceType, rilSsResponse->requestType)) {
- RLOGD("radio::onSupplementaryServiceIndicationInd CF type, num of Cf elements %d",
+ RLOGD("onSupplementaryServiceIndicationInd CF type, num of Cf elements %d",
rilSsResponse->cfData.numValidIndexes);
if (rilSsResponse->cfData.numValidIndexes > NUM_SERVICE_CLASSES) {
- RLOGE("radio::onSupplementaryServiceIndicationInd numValidIndexes is greater than "
+ RLOGE("onSupplementaryServiceIndicationInd numValidIndexes is greater than "
"max value %d, truncating it to max value", NUM_SERVICE_CLASSES);
rilSsResponse->cfData.numValidIndexes = NUM_SERVICE_CLASSES;
}
@@ -7142,7 +7129,7 @@
cfInfo->toa = cf.toa;
cfInfo->number = convertCharPtrToHidlString(cf.number);
cfInfo->timeSeconds = cf.timeSeconds;
- RLOGD("radio::onSupplementaryServiceIndicationInd: "
+ RLOGD("onSupplementaryServiceIndicationInd: "
"Data: %d,reason=%d,cls=%d,toa=%d,num=%s,tout=%d],", cf.status,
cf.reason, cf.serviceClass, cf.toa, (char*)cf.number, cf.timeSeconds);
}
@@ -7153,40 +7140,40 @@
/* each int */
ss.ssInfo[0].ssInfo.resize(SS_INFO_MAX);
for (int i = 0; i < SS_INFO_MAX; i++) {
- RLOGD("radio::onSupplementaryServiceIndicationInd: Data: %d",
+ RLOGD("onSupplementaryServiceIndicationInd: Data: %d",
rilSsResponse->ssInfo[i]);
ss.ssInfo[0].ssInfo[i] = rilSsResponse->ssInfo[i];
}
}
- RLOGD("radio::onSupplementaryServiceIndicationInd");
+ RLOGD("onSupplementaryServiceIndicationInd");
Return<void> retStatus = radioService[slotId]->mRadioIndication->
onSupplementaryServiceIndication(convertIntToRadioIndicationType(indicationType),
ss);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::onSupplementaryServiceIndicationInd: "
+ RLOGE("onSupplementaryServiceIndicationInd: "
"radioService[%d]->mRadioIndication == NULL", slotId);
}
return 0;
}
-int radio::stkCallControlAlphaNotifyInd(android::Parcel &p, int slotId, int requestNumber,
+int radio::stkCallControlAlphaNotifyInd(int slotId,
int indicationType, int token, RIL_Errno e, void *response,
size_t responseLen) {
if (radioService[slotId] != NULL && radioService[slotId]->mRadioIndication != NULL) {
if (response == NULL || responseLen == 0) {
- RLOGE("radio::stkCallControlAlphaNotifyInd: invalid response");
+ RLOGE("stkCallControlAlphaNotifyInd: invalid response");
return 0;
}
- RLOGD("radio::stkCallControlAlphaNotifyInd");
+ RLOGD("stkCallControlAlphaNotifyInd");
Return<void> retStatus = radioService[slotId]->mRadioIndication->stkCallControlAlphaNotify(
convertIntToRadioIndicationType(indicationType),
convertCharPtrToHidlString((char *) response));
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::stkCallControlAlphaNotifyInd: radioService[%d]->mRadioIndication == NULL",
+ RLOGE("stkCallControlAlphaNotifyInd: radioService[%d]->mRadioIndication == NULL",
slotId);
}
@@ -7200,34 +7187,34 @@
lce.lceSuspended = rilLceDataInfo->lce_suspended;
}
-int radio::lceDataInd(android::Parcel &p, int slotId, int requestNumber,
+int radio::lceDataInd(int slotId,
int indicationType, int token, RIL_Errno e, void *response,
size_t responseLen) {
if (radioService[slotId] != NULL && radioService[slotId]->mRadioIndication != NULL) {
if (response == NULL || responseLen != sizeof(RIL_LceDataInfo)) {
- RLOGE("radio::lceDataInd: invalid response");
+ RLOGE("lceDataInd: invalid response");
return 0;
}
LceDataInfo lce = {};
convertRilLceDataInfoToHal(response, responseLen, lce);
- RLOGD("radio::lceDataInd");
+ RLOGD("lceDataInd");
Return<void> retStatus = radioService[slotId]->mRadioIndication->lceData(
convertIntToRadioIndicationType(indicationType), lce);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::lceDataInd: radioService[%d]->mRadioIndication == NULL", slotId);
+ RLOGE("lceDataInd: radioService[%d]->mRadioIndication == NULL", slotId);
}
return 0;
}
-int radio::pcoDataInd(android::Parcel &p, int slotId, int requestNumber,
+int radio::pcoDataInd(int slotId,
int indicationType, int token, RIL_Errno e, void *response,
size_t responseLen) {
if (radioService[slotId] != NULL && radioService[slotId]->mRadioIndication != NULL) {
if (response == NULL || responseLen != sizeof(RIL_PCO_Data)) {
- RLOGE("radio::pcoDataInd: invalid response");
+ RLOGE("pcoDataInd: invalid response");
return 0;
}
@@ -7238,54 +7225,54 @@
pco.pcoId = rilPcoData->pco_id;
pco.contents.setToExternal((uint8_t *) rilPcoData->contents, rilPcoData->contents_length);
- RLOGD("radio::pcoDataInd");
+ RLOGD("pcoDataInd");
Return<void> retStatus = radioService[slotId]->mRadioIndication->pcoData(
convertIntToRadioIndicationType(indicationType), pco);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::pcoDataInd: radioService[%d]->mRadioIndication == NULL", slotId);
+ RLOGE("pcoDataInd: radioService[%d]->mRadioIndication == NULL", slotId);
}
return 0;
}
-int radio::modemResetInd(android::Parcel &p, int slotId, int requestNumber,
+int radio::modemResetInd(int slotId,
int indicationType, int token, RIL_Errno e, void *response,
size_t responseLen) {
if (radioService[slotId] != NULL && radioService[slotId]->mRadioIndication != NULL) {
if (response == NULL || responseLen == 0) {
- RLOGE("radio::modemResetInd: invalid response");
+ RLOGE("modemResetInd: invalid response");
return 0;
}
- RLOGD("radio::modemResetInd");
+ RLOGD("modemResetInd");
Return<void> retStatus = radioService[slotId]->mRadioIndication->modemReset(
convertIntToRadioIndicationType(indicationType),
convertCharPtrToHidlString((char *) response));
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("radio::modemResetInd: radioService[%d]->mRadioIndication == NULL", slotId);
+ RLOGE("modemResetInd: radioService[%d]->mRadioIndication == NULL", slotId);
}
return 0;
}
-int radio::oemHookRawInd(android::Parcel &p, int slotId, int requestNumber,
+int radio::oemHookRawInd(int slotId,
int indicationType, int token, RIL_Errno e, void *response,
size_t responseLen) {
if (oemHookService[slotId] != NULL && oemHookService[slotId]->mOemHookIndication != NULL) {
if (response == NULL || responseLen == 0) {
- RLOGE("radio::oemHookRawInd: invalid response");
+ RLOGE("oemHookRawInd: invalid response");
return 0;
}
hidl_vec<uint8_t> data;
data.setToExternal((uint8_t *) response, responseLen);
- RLOGD("radio::oemHookRawInd");
+ RLOGD("oemHookRawInd");
Return<void> retStatus = oemHookService[slotId]->mOemHookIndication->oemHookRaw(
convertIntToRadioIndicationType(indicationType), data);
checkReturnStatus(slotId, retStatus);
} else {
- RLOGE("radio::oemHookRawInd: oemHookService[%d]->mOemHookIndication == NULL", slotId);
+ RLOGE("oemHookRawInd: oemHookService[%d]->mOemHookIndication == NULL", slotId);
}
return 0;
@@ -7334,7 +7321,7 @@
radioService[i]->mSlotId = i;
oemHookService[i] = new OemHookImpl;
oemHookService[i]->mSlotId = i;
- RLOGD("radio::registerService: starting IRadio %s", serviceNames[i]);
+ RLOGD("registerService: starting IRadio %s", serviceNames[i]);
android::status_t status = radioService[i]->registerAsService(serviceNames[i]);
status = oemHookService[i]->registerAsService(oemHookServiceNames[i]);
diff --git a/libril/ril_service.h b/libril/ril_service.h
index 58a7d13..441b587 100644
--- a/libril/ril_service.h
+++ b/libril/ril_service.h
@@ -22,689 +22,690 @@
namespace radio {
void registerService(RIL_RadioFunctions *callbacks, android::CommandInfo *commands);
-int getIccCardStatusResponse(android::Parcel &p, int slotId, int requestNumber, int responseType,
+
+int getIccCardStatusResponse(int slotId, int responseType,
int token, RIL_Errno e, void *response, size_t responselen);
-int supplyIccPinForAppResponse(android::Parcel &p, int slotId, int requestNumber,
+int supplyIccPinForAppResponse(int slotId,
int responseType, int serial, RIL_Errno e, void *response,
size_t responselen);
-int supplyIccPukForAppResponse(android::Parcel &p, int slotId, int requestNumber,
+int supplyIccPukForAppResponse(int slotId,
int responseType, int serial, RIL_Errno e, void *response,
size_t responselen);
-int supplyIccPin2ForAppResponse(android::Parcel &p, int slotId, int requestNumber,
+int supplyIccPin2ForAppResponse(int slotId,
int responseType, int serial, RIL_Errno e, void *response,
size_t responselen);
-int supplyIccPuk2ForAppResponse(android::Parcel &p, int slotId, int requestNumber,
+int supplyIccPuk2ForAppResponse(int slotId,
int responseType, int serial, RIL_Errno e, void *response,
size_t responselen);
-int changeIccPinForAppResponse(android::Parcel &p, int slotId, int requestNumber,
+int changeIccPinForAppResponse(int slotId,
int responseType, int serial, RIL_Errno e, void *response,
size_t responselen);
-int changeIccPin2ForAppResponse(android::Parcel &p, int slotId, int requestNumber,
+int changeIccPin2ForAppResponse(int slotId,
int responseType, int serial, RIL_Errno e, void *response,
size_t responselen);
-int supplyNetworkDepersonalizationResponse(android::Parcel &p, int slotId, int requestNumber,
+int supplyNetworkDepersonalizationResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responselen);
-int getCurrentCallsResponse(android::Parcel &p, int slotId, int requestNumber,
+int getCurrentCallsResponse(int slotId,
int responseType, int serial, RIL_Errno e, void *response,
size_t responselen);
-int dialResponse(android::Parcel &p, int slotId, int requestNumber,
+int dialResponse(int slotId,
int responseType, int serial, RIL_Errno e, void *response, size_t responselen);
-int getIMSIForAppResponse(android::Parcel &p, int slotId, int requestNumber, int responseType,
+int getIMSIForAppResponse(int slotId, int responseType,
int serial, RIL_Errno e, void *response, size_t responselen);
-int hangupConnectionResponse(android::Parcel &p, int slotId, int requestNumber, int responseType,
+int hangupConnectionResponse(int slotId, int responseType,
int serial, RIL_Errno e, void *response, size_t responselen);
-int hangupWaitingOrBackgroundResponse(android::Parcel &p, int slotId, int requestNumber,
+int hangupWaitingOrBackgroundResponse(int slotId,
int responseType, int serial, RIL_Errno e, void *response,
size_t responselen);
-int hangupForegroundResumeBackgroundResponse(android::Parcel &p, int slotId, int requestNumber,
+int hangupForegroundResumeBackgroundResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responselen);
-int switchWaitingOrHoldingAndActiveResponse(android::Parcel &p, int slotId, int requestNumber,
+int switchWaitingOrHoldingAndActiveResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responselen);
-int conferenceResponse(android::Parcel &p, int slotId, int requestNumber, int responseType,
+int conferenceResponse(int slotId, int responseType,
int serial, RIL_Errno e, void *response, size_t responselen);
-int rejectCallResponse(android::Parcel &p, int slotId, int requestNumber, int responseType,
+int rejectCallResponse(int slotId, int responseType,
int serial, RIL_Errno e, void *response, size_t responselen);
-int getLastCallFailCauseResponse(android::Parcel &p, int slotId, int requestNumber,
+int getLastCallFailCauseResponse(int slotId,
int responseType, int serial, RIL_Errno e, void *response,
size_t responselen);
-int getSignalStrengthResponse(android::Parcel &p, int slotId, int requestNumber,
+int getSignalStrengthResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responseLen);
-int getVoiceRegistrationStateResponse(android::Parcel &p, int slotId, int requestNumber,
+int getVoiceRegistrationStateResponse(int slotId,
int responseType, int serial, RIL_Errno e, void *response,
size_t responselen);
-int getDataRegistrationStateResponse(android::Parcel &p, int slotId, int requestNumber,
+int getDataRegistrationStateResponse(int slotId,
int responseType, int serial, RIL_Errno e, void *response,
size_t responselen);
-int getOperatorResponse(android::Parcel &p, int slotId, int requestNumber,
+int getOperatorResponse(int slotId,
int responseType, int serial, RIL_Errno e, void *response,
size_t responselen);
-int setRadioPowerResponse(android::Parcel &p, int slotId, int requestNumber,
+int setRadioPowerResponse(int slotId,
int responseType, int serial, RIL_Errno e, void *response,
size_t responselen);
-int sendDtmfResponse(android::Parcel &p, int slotId, int requestNumber,
+int sendDtmfResponse(int slotId,
int responseType, int serial, RIL_Errno e, void *response,
size_t responselen);
-int sendSmsResponse(android::Parcel &p, int slotId, int requestNumber,
+int sendSmsResponse(int slotId,
int responseType, int serial, RIL_Errno e, void *response,
size_t responselen);
-int sendSMSExpectMoreResponse(android::Parcel &p, int slotId, int requestNumber,
+int sendSMSExpectMoreResponse(int slotId,
int responseType, int serial, RIL_Errno e, void *response,
size_t responselen);
-int setupDataCallResponse(android::Parcel &p, int slotId, int requestNumber,
+int setupDataCallResponse(int slotId,
int responseType, int serial, RIL_Errno e, void *response,
size_t responseLen);
-int iccIOForAppResponse(android::Parcel &p, int slotId, int requestNumber,
+int iccIOForAppResponse(int slotId,
int responseType, int serial, RIL_Errno e, void *response,
size_t responselen);
-int sendUssdResponse(android::Parcel &p, int slotId, int requestNumber,
+int sendUssdResponse(int slotId,
int responseType, int serial, RIL_Errno e, void *response,
size_t responselen);
-int cancelPendingUssdResponse(android::Parcel &p, int slotId, int requestNumber,
+int cancelPendingUssdResponse(int slotId,
int responseType, int serial, RIL_Errno e, void *response,
size_t responselen);
-int getClirResponse(android::Parcel &p, int slotId, int requestNumber,
+int getClirResponse(int slotId,
int responseType, int serial, RIL_Errno e, void *response, size_t responselen);
-int setClirResponse(android::Parcel &p, int slotId, int requestNumber,
+int setClirResponse(int slotId,
int responseType, int serial, RIL_Errno e, void *response, size_t responselen);
-int getCallForwardStatusResponse(android::Parcel &p, int slotId, int requestNumber,
+int getCallForwardStatusResponse(int slotId,
int responseType, int serial, RIL_Errno e, void *response,
size_t responselen);
-int setCallForwardResponse(android::Parcel &p, int slotId, int requestNumber,
+int setCallForwardResponse(int slotId,
int responseType, int serial, RIL_Errno e, void *response,
size_t responselen);
-int getCallWaitingResponse(android::Parcel &p, int slotId, int requestNumber,
+int getCallWaitingResponse(int slotId,
int responseType, int serial, RIL_Errno e, void *response,
size_t responselen);
-int setCallWaitingResponse(android::Parcel &p, int slotId, int requestNumber,
+int setCallWaitingResponse(int slotId,
int responseType, int serial, RIL_Errno e, void *response,
size_t responselen);
-int acknowledgeLastIncomingGsmSmsResponse(android::Parcel &p, int slotId, int requestNumber,
+int acknowledgeLastIncomingGsmSmsResponse(int slotId,
int responseType, int serial, RIL_Errno e, void *response,
size_t responselen);
-int acceptCallResponse(android::Parcel &p, int slotId, int requestNumber,
+int acceptCallResponse(int slotId,
int responseType, int serial, RIL_Errno e, void *response,
size_t responselen);
-int deactivateDataCallResponse(android::Parcel &p, int slotId, int requestNumber,
+int deactivateDataCallResponse(int slotId,
int responseType, int serial, RIL_Errno e, void *response,
size_t responselen);
-int getFacilityLockForAppResponse(android::Parcel &p, int slotId, int requestNumber,
+int getFacilityLockForAppResponse(int slotId,
int responseType, int serial, RIL_Errno e, void *response,
size_t responselen);
-int setFacilityLockForAppResponse(android::Parcel &p, int slotId, int requestNumber,
+int setFacilityLockForAppResponse(int slotId,
int responseType, int serial, RIL_Errno e, void *response,
size_t responselen);
-int setBarringPasswordResponse(android::Parcel &p, int slotId, int requestNumber,
+int setBarringPasswordResponse(int slotId,
int responseType, int serial, RIL_Errno e, void *response,
size_t responselen);
-int getNetworkSelectionModeResponse(android::Parcel &p, int slotId, int requestNumber,
+int getNetworkSelectionModeResponse(int slotId,
int responseType, int serial, RIL_Errno e, void *response,
size_t responselen);
-int setNetworkSelectionModeAutomaticResponse(android::Parcel &p, int slotId, int requestNumber,
+int setNetworkSelectionModeAutomaticResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responselen);
-int setNetworkSelectionModeManualResponse(android::Parcel &p, int slotId, int requestNumber,
+int setNetworkSelectionModeManualResponse(int slotId,
int responseType, int serial, RIL_Errno e, void *response,
size_t responselen);
-int getAvailableNetworksResponse(android::Parcel &p, int slotId, int requestNumber,
+int getAvailableNetworksResponse(int slotId,
int responseType, int serial, RIL_Errno e, void *response,
size_t responselen);
-int startDtmfResponse(android::Parcel &p, int slotId, int requestNumber,
+int startDtmfResponse(int slotId,
int responseType, int serial, RIL_Errno e, void *response,
size_t responselen);
-int stopDtmfResponse(android::Parcel &p, int slotId, int requestNumber,
+int stopDtmfResponse(int slotId,
int responseType, int serial, RIL_Errno e, void *response,
size_t responselen);
-int getBasebandVersionResponse(android::Parcel &p, int slotId, int requestNumber,
+int getBasebandVersionResponse(int slotId,
int responseType, int serial, RIL_Errno e, void *response,
size_t responselen);
-int separateConnectionResponse(android::Parcel &p, int slotId, int requestNumber,
+int separateConnectionResponse(int slotId,
int responseType, int serial, RIL_Errno e, void *response,
size_t responselen);
-int setMuteResponse(android::Parcel &p, int slotId, int requestNumber,
+int setMuteResponse(int slotId,
int responseType, int serial, RIL_Errno e, void *response,
size_t responselen);
-int getMuteResponse(android::Parcel &p, int slotId, int requestNumber,
+int getMuteResponse(int slotId,
int responseType, int serial, RIL_Errno e, void *response,
size_t responselen);
-int getClipResponse(android::Parcel &p, int slotId, int requestNumber,
+int getClipResponse(int slotId,
int responseType, int serial, RIL_Errno e, void *response,
size_t responselen);
-int getDataCallListResponse(android::Parcel &p, int slotId, int requestNumber,
+int getDataCallListResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responseLen);
-int setSuppServiceNotificationsResponse(android::Parcel &p, int slotId, int requestNumber,
+int setSuppServiceNotificationsResponse(int slotId,
int responseType, int serial, RIL_Errno e, void *response,
size_t responselen);
-int writeSmsToSimResponse(android::Parcel &p, int slotId, int requestNumber,
+int writeSmsToSimResponse(int slotId,
int responseType, int serial, RIL_Errno e, void *response,
size_t responselen);
-int deleteSmsOnSimResponse(android::Parcel &p, int slotId, int requestNumber,
+int deleteSmsOnSimResponse(int slotId,
int responseType, int serial, RIL_Errno e, void *response,
size_t responselen);
-int setBandModeResponse(android::Parcel &p, int slotId, int requestNumber,
+int setBandModeResponse(int slotId,
int responseType, int serial, RIL_Errno e, void *response,
size_t responselen);
-int getAvailableBandModesResponse(android::Parcel &p, int slotId, int requestNumber,
+int getAvailableBandModesResponse(int slotId,
int responseType, int serial, RIL_Errno e, void *response,
size_t responselen);
-int sendEnvelopeResponse(android::Parcel &p, int slotId, int requestNumber,
+int sendEnvelopeResponse(int slotId,
int responseType, int serial, RIL_Errno e, void *response,
size_t responselen);
-int sendTerminalResponseToSimResponse(android::Parcel &p, int slotId, int requestNumber,
+int sendTerminalResponseToSimResponse(int slotId,
int responseType, int serial, RIL_Errno e, void *response,
size_t responselen);
-int handleStkCallSetupRequestFromSimResponse(android::Parcel &p, int slotId, int requestNumber,
+int handleStkCallSetupRequestFromSimResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responselen);
-int explicitCallTransferResponse(android::Parcel &p, int slotId, int requestNumber,
+int explicitCallTransferResponse(int slotId,
int responseType, int serial, RIL_Errno e, void *response,
size_t responselen);
-int setPreferredNetworkTypeResponse(android::Parcel &p, int slotId, int requestNumber,
+int setPreferredNetworkTypeResponse(int slotId,
int responseType, int serial, RIL_Errno e, void *response,
size_t responselen);
-int getPreferredNetworkTypeResponse(android::Parcel &p, int slotId, int requestNumber,
+int getPreferredNetworkTypeResponse(int slotId,
int responseType, int serial, RIL_Errno e, void *response,
size_t responselen);
-int getNeighboringCidsResponse(android::Parcel &p, int slotId, int requestNumber,
+int getNeighboringCidsResponse(int slotId,
int responseType, int serial, RIL_Errno e, void *response,
size_t responselen);
-int setLocationUpdatesResponse(android::Parcel &p, int slotId, int requestNumber,
+int setLocationUpdatesResponse(int slotId,
int responseType, int serial, RIL_Errno e, void *response,
size_t responselen);
-int setCdmaSubscriptionSourceResponse(android::Parcel &p, int slotId, int requestNumber,
+int setCdmaSubscriptionSourceResponse(int slotId,
int responseType, int serial, RIL_Errno e, void *response,
size_t responselen);
-int setCdmaRoamingPreferenceResponse(android::Parcel &p, int slotId, int requestNumber,
+int setCdmaRoamingPreferenceResponse(int slotId,
int responseType, int serial, RIL_Errno e, void *response,
size_t responselen);
-int getCdmaRoamingPreferenceResponse(android::Parcel &p, int slotId, int requestNumber,
+int getCdmaRoamingPreferenceResponse(int slotId,
int responseType, int serial, RIL_Errno e, void *response,
size_t responselen);
-int setTTYModeResponse(android::Parcel &p, int slotId, int requestNumber,
+int setTTYModeResponse(int slotId,
int responseType, int serial, RIL_Errno e, void *response,
size_t responselen);
-int getTTYModeResponse(android::Parcel &p, int slotId, int requestNumber,
+int getTTYModeResponse(int slotId,
int responseType, int serial, RIL_Errno e, void *response,
size_t responselen);
-int setPreferredVoicePrivacyResponse(android::Parcel &p, int slotId, int requestNumber,
+int setPreferredVoicePrivacyResponse(int slotId,
int responseType, int serial, RIL_Errno e, void *response,
size_t responselen);
-int getPreferredVoicePrivacyResponse(android::Parcel &p, int slotId, int requestNumber,
+int getPreferredVoicePrivacyResponse(int slotId,
int responseType, int serial, RIL_Errno e, void *response,
size_t responselen);
-int sendCDMAFeatureCodeResponse(android::Parcel &p, int slotId, int requestNumber,
+int sendCDMAFeatureCodeResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responselen);
-int sendBurstDtmfResponse(android::Parcel &p, int slotId, int requestNumber,
+int sendBurstDtmfResponse(int slotId,
int responseType, int serial, RIL_Errno e, void *response,
size_t responselen);
-int sendCdmaSmsResponse(android::Parcel &p, int slotId, int requestNumber,
+int sendCdmaSmsResponse(int slotId,
int responseType, int serial, RIL_Errno e, void *response,
size_t responselen);
-int acknowledgeLastIncomingCdmaSmsResponse(android::Parcel &p, int slotId, int requestNumber,
+int acknowledgeLastIncomingCdmaSmsResponse(int slotId,
int responseType, int serial, RIL_Errno e, void *response,
size_t responselen);
-int getGsmBroadcastConfigResponse(android::Parcel &p, int slotId, int requestNumber,
+int getGsmBroadcastConfigResponse(int slotId,
int responseType, int serial, RIL_Errno e, void *response,
size_t responselen);
-int setGsmBroadcastConfigResponse(android::Parcel &p, int slotId, int requestNumber,
+int setGsmBroadcastConfigResponse(int slotId,
int responseType, int serial, RIL_Errno e, void *response,
size_t responselen);
-int setGsmBroadcastActivationResponse(android::Parcel &p, int slotId, int requestNumber,
+int setGsmBroadcastActivationResponse(int slotId,
int responseType, int serial, RIL_Errno e, void *response,
size_t responselen);
-int getCdmaBroadcastConfigResponse(android::Parcel &p, int slotId, int requestNumber,
+int getCdmaBroadcastConfigResponse(int slotId,
int responseType, int serial, RIL_Errno e, void *response,
size_t responselen);
-int setCdmaBroadcastConfigResponse(android::Parcel &p, int slotId, int requestNumber,
+int setCdmaBroadcastConfigResponse(int slotId,
int responseType, int serial, RIL_Errno e, void *response,
size_t responselen);
-int setCdmaBroadcastActivationResponse(android::Parcel &p, int slotId, int requestNumber,
+int setCdmaBroadcastActivationResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responselen);
-int getCDMASubscriptionResponse(android::Parcel &p, int slotId, int requestNumber,
+int getCDMASubscriptionResponse(int slotId,
int responseType, int serial, RIL_Errno e, void *response,
size_t responselen);
-int writeSmsToRuimResponse(android::Parcel &p, int slotId, int requestNumber,
+int writeSmsToRuimResponse(int slotId,
int responseType, int serial, RIL_Errno e, void *response,
size_t responselen);
-int deleteSmsOnRuimResponse(android::Parcel &p, int slotId, int requestNumber,
+int deleteSmsOnRuimResponse(int slotId,
int responseType, int serial, RIL_Errno e, void *response,
size_t responselen);
-int getDeviceIdentityResponse(android::Parcel &p, int slotId, int requestNumber,
+int getDeviceIdentityResponse(int slotId,
int responseType, int serial, RIL_Errno e, void *response,
size_t responselen);
-int exitEmergencyCallbackModeResponse(android::Parcel &p, int slotId, int requestNumber,
+int exitEmergencyCallbackModeResponse(int slotId,
int responseType, int serial, RIL_Errno e, void *response,
size_t responselen);
-int getSmscAddressResponse(android::Parcel &p, int slotId, int requestNumber,
+int getSmscAddressResponse(int slotId,
int responseType, int serial, RIL_Errno e, void *response,
size_t responselen);
-int setCdmaBroadcastActivationResponse(android::Parcel &p, int slotId, int requestNumber,
+int setCdmaBroadcastActivationResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responselen);
-int setSmscAddressResponse(android::Parcel &p, int slotId, int requestNumber,
+int setSmscAddressResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responselen);
-int reportSmsMemoryStatusResponse(android::Parcel &p, int slotId, int requestNumber,
+int reportSmsMemoryStatusResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responselen);
-int reportStkServiceIsRunningResponse(android::Parcel &p, int slotId, int requestNumber,
+int reportStkServiceIsRunningResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responseLen);
-int getCdmaSubscriptionSourceResponse(android::Parcel &p, int slotId, int requestNumber,
+int getCdmaSubscriptionSourceResponse(int slotId,
int responseType, int serial, RIL_Errno e, void *response,
size_t responselen);
-int requestIsimAuthenticationResponse(android::Parcel &p, int slotId, int requestNumber,
+int requestIsimAuthenticationResponse(int slotId,
int responseType, int serial, RIL_Errno e, void *response,
size_t responselen);
-int acknowledgeIncomingGsmSmsWithPduResponse(android::Parcel &p, int slotId, int requestNumber,
+int acknowledgeIncomingGsmSmsWithPduResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responselen);
-int sendEnvelopeWithStatusResponse(android::Parcel &p, int slotId, int requestNumber,
+int sendEnvelopeWithStatusResponse(int slotId,
int responseType, int serial, RIL_Errno e, void *response,
size_t responselen);
-int getVoiceRadioTechnologyResponse(android::Parcel &p, int slotId, int requestNumber,
+int getVoiceRadioTechnologyResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responselen);
-int getCellInfoListResponse(android::Parcel &p, int slotId,
- int requestNumber, int responseType,
+int getCellInfoListResponse(int slotId,
+ int responseType,
int serial, RIL_Errno e, void *response,
size_t responseLen);
-int setCellInfoListRateResponse(android::Parcel &p, int slotId, int requestNumber,
+int setCellInfoListRateResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responselen);
-int setInitialAttachApnResponse(android::Parcel &p, int slotId, int requestNumber,
+int setInitialAttachApnResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responselen);
-int getImsRegistrationStateResponse(android::Parcel &p, int slotId, int requestNumber,
+int getImsRegistrationStateResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responselen);
-int sendImsSmsResponse(android::Parcel &p, int slotId, int requestNumber, int responseType,
+int sendImsSmsResponse(int slotId, int responseType,
int serial, RIL_Errno e, void *response, size_t responselen);
-int iccTransmitApduBasicChannelResponse(android::Parcel &p, int slotId, int requestNumber,
+int iccTransmitApduBasicChannelResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responselen);
-int iccOpenLogicalChannelResponse(android::Parcel &p, int slotId, int requestNumber,
+int iccOpenLogicalChannelResponse(int slotId,
int responseType, int serial, RIL_Errno e, void *response,
size_t responselen);
-int iccCloseLogicalChannelResponse(android::Parcel &p, int slotId, int requestNumber,
+int iccCloseLogicalChannelResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responselen);
-int iccTransmitApduLogicalChannelResponse(android::Parcel &p, int slotId, int requestNumber,
+int iccTransmitApduLogicalChannelResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responselen);
-int nvReadItemResponse(android::Parcel &p, int slotId, int requestNumber,
+int nvReadItemResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responselen);
-int nvWriteItemResponse(android::Parcel &p, int slotId, int requestNumber,
+int nvWriteItemResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responselen);
-int nvWriteCdmaPrlResponse(android::Parcel &p, int slotId, int requestNumber,
+int nvWriteCdmaPrlResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responselen);
-int nvResetConfigResponse(android::Parcel &p, int slotId, int requestNumber,
+int nvResetConfigResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responselen);
-int setUiccSubscriptionResponse(android::Parcel &p, int slotId, int requestNumber,
+int setUiccSubscriptionResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responselen);
-int setDataAllowedResponse(android::Parcel &p, int slotId, int requestNumber,
+int setDataAllowedResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responselen);
-int getHardwareConfigResponse(android::Parcel &p, int slotId, int requestNumber,
+int getHardwareConfigResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responseLen);
-int requestIccSimAuthenticationResponse(android::Parcel &p, int slotId, int requestNumber,
+int requestIccSimAuthenticationResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responselen);
-int setDataProfileResponse(android::Parcel &p, int slotId, int requestNumber,
+int setDataProfileResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responselen);
-int requestShutdownResponse(android::Parcel &p, int slotId, int requestNumber,
+int requestShutdownResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responselen);
-int getRadioCapabilityResponse(android::Parcel &p, int slotId, int requestNumber,
+int getRadioCapabilityResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responseLen);
-int setRadioCapabilityResponse(android::Parcel &p, int slotId, int requestNumber,
+int setRadioCapabilityResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responseLen);
-int startLceServiceResponse(android::Parcel &p, int slotId, int requestNumber,
+int startLceServiceResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responselen);
-int stopLceServiceResponse(android::Parcel &p, int slotId, int requestNumber,
+int stopLceServiceResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responselen);
-int pullLceDataResponse(android::Parcel &p, int slotId, int requestNumber,
+int pullLceDataResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responseLen);
-int getModemActivityInfoResponse(android::Parcel &p, int slotId, int requestNumber,
+int getModemActivityInfoResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responselen);
-int setAllowedCarriersResponse(android::Parcel &p, int slotId, int requestNumber,
+int setAllowedCarriersResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responselen);
-int getAllowedCarriersResponse(android::Parcel &p, int slotId, int requestNumber,
+int getAllowedCarriersResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responselen);
-int sendDeviceStateResponse(android::Parcel &p, int slotId, int requestNumber,
+int sendDeviceStateResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responselen);
-int setIndicationFilterResponse(android::Parcel &p, int slotId, int requestNumber,
+int setIndicationFilterResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responselen);
-int setSimCardPowerResponse(android::Parcel &p, int slotId, int requestNumber,
+int setSimCardPowerResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responselen);
void acknowledgeRequest(int slotId, int serial);
-int radioStateChangedInd(android::Parcel &p, int slotId, int requestNumber,
+int radioStateChangedInd(int slotId,
int indicationType, int token, RIL_Errno e, void *response,
size_t responseLen);
-int callStateChangedInd(android::Parcel &p, int slotId, int requestNumber, int indType, int token,
+int callStateChangedInd(int slotId, int indType, int token,
RIL_Errno e, void *response, size_t responselen);
-int networkStateChangedInd(android::Parcel &p, int slotId, int requestNumber, int indType,
+int networkStateChangedInd(int slotId, int indType,
int token, RIL_Errno e, void *response, size_t responselen);
-int newSmsInd(android::Parcel &p, int slotId, int requestNumber, int indicationType,
+int newSmsInd(int slotId, int indicationType,
int token, RIL_Errno e, void *response, size_t responselen);
-int newSmsStatusReportInd(android::Parcel &p, int slotId, int requestNumber, int indicationType,
+int newSmsStatusReportInd(int slotId, int indicationType,
int token, RIL_Errno e, void *response, size_t responselen);
-int newSmsOnSimInd(android::Parcel &p, int slotId, int requestNumber, int indicationType,
+int newSmsOnSimInd(int slotId, int indicationType,
int token, RIL_Errno e, void *response, size_t responselen);
-int onUssdInd(android::Parcel &p, int slotId, int requestNumber, int indicationType,
+int onUssdInd(int slotId, int indicationType,
int token, RIL_Errno e, void *response, size_t responselen);
-int nitzTimeReceivedInd(android::Parcel &p, int slotId, int requestNumber, int indicationType,
+int nitzTimeReceivedInd(int slotId, int indicationType,
int token, RIL_Errno e, void *response, size_t responselen);
-int currentSignalStrengthInd(android::Parcel &p, int slotId, int requestNumber,
+int currentSignalStrengthInd(int slotId,
int indicationType, int token, RIL_Errno e,
void *response, size_t responselen);
-int dataCallListChangedInd(android::Parcel &p, int slotId, int requestNumber, int indicationType,
+int dataCallListChangedInd(int slotId, int indicationType,
int token, RIL_Errno e, void *response, size_t responselen);
-int suppSvcNotifyInd(android::Parcel &p, int slotId, int requestNumber, int indicationType,
+int suppSvcNotifyInd(int slotId, int indicationType,
int token, RIL_Errno e, void *response, size_t responselen);
-int stkSessionEndInd(android::Parcel &p, int slotId, int requestNumber, int indicationType,
+int stkSessionEndInd(int slotId, int indicationType,
int token, RIL_Errno e, void *response, size_t responselen);
-int stkProactiveCommandInd(android::Parcel &p, int slotId, int requestNumber, int indicationType,
+int stkProactiveCommandInd(int slotId, int indicationType,
int token, RIL_Errno e, void *response, size_t responselen);
-int stkEventNotifyInd(android::Parcel &p, int slotId, int requestNumber, int indicationType,
+int stkEventNotifyInd(int slotId, int indicationType,
int token, RIL_Errno e, void *response, size_t responselen);
-int stkCallSetupInd(android::Parcel &p, int slotId, int requestNumber, int indicationType,
+int stkCallSetupInd(int slotId, int indicationType,
int token, RIL_Errno e, void *response, size_t responselen);
-int simSmsStorageFullInd(android::Parcel &p, int slotId, int requestNumber, int indicationType,
+int simSmsStorageFullInd(int slotId, int indicationType,
int token, RIL_Errno e, void *response, size_t responselen);
-int simRefreshInd(android::Parcel &p, int slotId, int requestNumber, int indicationType,
+int simRefreshInd(int slotId, int indicationType,
int token, RIL_Errno e, void *response, size_t responselen);
-int callRingInd(android::Parcel &p, int slotId, int requestNumber, int indicationType,
+int callRingInd(int slotId, int indicationType,
int token, RIL_Errno e, void *response, size_t responselen);
-int simStatusChangedInd(android::Parcel &p, int slotId, int requestNumber, int indicationType,
+int simStatusChangedInd(int slotId, int indicationType,
int token, RIL_Errno e, void *response, size_t responselen);
-int cdmaNewSmsInd(android::Parcel &p, int slotId, int requestNumber, int indicationType,
+int cdmaNewSmsInd(int slotId, int indicationType,
int token, RIL_Errno e, void *response, size_t responselen);
-int newBroadcastSmsInd(android::Parcel &p, int slotId, int requestNumber,
+int newBroadcastSmsInd(int slotId,
int indicationType, int token, RIL_Errno e, void *response,
size_t responselen);
-int cdmaRuimSmsStorageFullInd(android::Parcel &p, int slotId, int requestNumber,
+int cdmaRuimSmsStorageFullInd(int slotId,
int indicationType, int token, RIL_Errno e, void *response,
size_t responselen);
-int restrictedStateChangedInd(android::Parcel &p, int slotId, int requestNumber,
+int restrictedStateChangedInd(int slotId,
int indicationType, int token, RIL_Errno e, void *response,
size_t responselen);
-int enterEmergencyCallbackModeInd(android::Parcel &p, int slotId, int requestNumber,
+int enterEmergencyCallbackModeInd(int slotId,
int indicationType, int token, RIL_Errno e, void *response,
size_t responselen);
-int cdmaCallWaitingInd(android::Parcel &p, int slotId, int requestNumber,
+int cdmaCallWaitingInd(int slotId,
int indicationType, int token, RIL_Errno e, void *response,
size_t responselen);
-int cdmaOtaProvisionStatusInd(android::Parcel &p, int slotId, int requestNumber,
+int cdmaOtaProvisionStatusInd(int slotId,
int indicationType, int token, RIL_Errno e, void *response,
size_t responselen);
-int cdmaInfoRecInd(android::Parcel &p, int slotId, int requestNumber,
+int cdmaInfoRecInd(int slotId,
int indicationType, int token, RIL_Errno e, void *response,
size_t responselen);
-int oemHookRawInd(android::Parcel &p, int slotId, int requestNumber,
+int oemHookRawInd(int slotId,
int indicationType, int token, RIL_Errno e, void *response,
size_t responselen);
-int indicateRingbackToneInd(android::Parcel &p, int slotId, int requestNumber,
+int indicateRingbackToneInd(int slotId,
int indicationType, int token, RIL_Errno e, void *response,
size_t responselen);
-int resendIncallMuteInd(android::Parcel &p, int slotId, int requestNumber,
+int resendIncallMuteInd(int slotId,
int indicationType, int token, RIL_Errno e, void *response,
size_t responselen);
-int cdmaSubscriptionSourceChangedInd(android::Parcel &p, int slotId, int requestNumber,
+int cdmaSubscriptionSourceChangedInd(int slotId,
int indicationType, int token, RIL_Errno e,
void *response, size_t responselen);
-int cdmaPrlChangedInd(android::Parcel &p, int slotId, int requestNumber,
+int cdmaPrlChangedInd(int slotId,
int indicationType, int token, RIL_Errno e, void *response,
size_t responselen);
-int exitEmergencyCallbackModeInd(android::Parcel &p, int slotId, int requestNumber,
+int exitEmergencyCallbackModeInd(int slotId,
int indicationType, int token, RIL_Errno e, void *response,
size_t responselen);
-int rilConnectedInd(android::Parcel &p, int slotId, int requestNumber,
+int rilConnectedInd(int slotId,
int indicationType, int token, RIL_Errno e, void *response,
size_t responselen);
-int voiceRadioTechChangedInd(android::Parcel &p, int slotId, int requestNumber,
+int voiceRadioTechChangedInd(int slotId,
int indicationType, int token, RIL_Errno e, void *response,
size_t responselen);
-int cellInfoListInd(android::Parcel &p, int slotId, int requestNumber,
+int cellInfoListInd(int slotId,
int indicationType, int token, RIL_Errno e, void *response,
size_t responselen);
-int imsNetworkStateChangedInd(android::Parcel &p, int slotId, int requestNumber,
+int imsNetworkStateChangedInd(int slotId,
int indicationType, int token, RIL_Errno e, void *response,
size_t responselen);
-int subscriptionStatusChangedInd(android::Parcel &p, int slotId, int requestNumber,
+int subscriptionStatusChangedInd(int slotId,
int indicationType, int token, RIL_Errno e, void *response,
size_t responselen);
-int srvccStateNotifyInd(android::Parcel &p, int slotId, int requestNumber,
+int srvccStateNotifyInd(int slotId,
int indicationType, int token, RIL_Errno e, void *response,
size_t responselen);
-int hardwareConfigChangedInd(android::Parcel &p, int slotId, int requestNumber,
+int hardwareConfigChangedInd(int slotId,
int indicationType, int token, RIL_Errno e, void *response,
size_t responselen);
-int radioCapabilityIndicationInd(android::Parcel &p, int slotId, int requestNumber,
+int radioCapabilityIndicationInd(int slotId,
int indicationType, int token, RIL_Errno e, void *response,
size_t responselen);
-int onSupplementaryServiceIndicationInd(android::Parcel &p, int slotId, int requestNumber,
+int onSupplementaryServiceIndicationInd(int slotId,
int indicationType, int token, RIL_Errno e,
void *response, size_t responselen);
-int stkCallControlAlphaNotifyInd(android::Parcel &p, int slotId, int requestNumber,
+int stkCallControlAlphaNotifyInd(int slotId,
int indicationType, int token, RIL_Errno e, void *response,
size_t responselen);
-int lceDataInd(android::Parcel &p, int slotId, int requestNumber,
+int lceDataInd(int slotId,
int indicationType, int token, RIL_Errno e, void *response,
size_t responselen);
-int pcoDataInd(android::Parcel &p, int slotId, int requestNumber,
+int pcoDataInd(int slotId,
int indicationType, int token, RIL_Errno e, void *response,
size_t responselen);
-int modemResetInd(android::Parcel &p, int slotId, int requestNumber,
+int modemResetInd(int slotId,
int indicationType, int token, RIL_Errno e, void *response,
size_t responselen);
-int sendRequestRawResponse(android::Parcel &p, int slotId, int requestNumber,
+int sendRequestRawResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responseLen);
-int sendRequestStringsResponse(android::Parcel &p, int slotId, int requestNumber,
+int sendRequestStringsResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responseLen);
diff --git a/libril/ril_unsol_commands.h b/libril/ril_unsol_commands.h
index a14d7bf..0b25361 100644
--- a/libril/ril_unsol_commands.h
+++ b/libril/ril_unsol_commands.h
@@ -55,7 +55,7 @@
{RIL_UNSOL_UICC_SUBSCRIPTION_STATUS_CHANGED, radio::subscriptionStatusChangedInd, WAKE_PARTIAL},
{RIL_UNSOL_SRVCC_STATE_NOTIFY, radio::srvccStateNotifyInd, WAKE_PARTIAL},
{RIL_UNSOL_HARDWARE_CONFIG_CHANGED, radio::hardwareConfigChangedInd, WAKE_PARTIAL},
- {RIL_UNSOL_DC_RT_INFO_CHANGED, responseDcRtInfo, WAKE_PARTIAL},
+ {RIL_UNSOL_DC_RT_INFO_CHANGED, NULL, WAKE_PARTIAL},
{RIL_UNSOL_RADIO_CAPABILITY, radio::radioCapabilityIndicationInd, WAKE_PARTIAL},
{RIL_UNSOL_ON_SS, radio::onSupplementaryServiceIndicationInd, WAKE_PARTIAL},
{RIL_UNSOL_STK_CC_ALPHA_NOTIFY, radio::stkCallControlAlphaNotifyInd, WAKE_PARTIAL},
