diff options
author | Steve Block <steveblock@google.com> | 2012-01-08 13:48:26 +0000 |
---|---|---|
committer | Steve Block <steveblock@google.com> | 2012-01-08 13:48:26 +0000 |
commit | f423cde8f901a72fd0cb811583a2cdabe62c64bd (patch) | |
tree | 282aa909cffb6def3ec505c06c3116e58b1bf41a /libril | |
parent | 43b9c52fcaab343282243b6cbc3c5b2a56760f09 (diff) | |
download | android_hardware_ril-f423cde8f901a72fd0cb811583a2cdabe62c64bd.tar.gz android_hardware_ril-f423cde8f901a72fd0cb811583a2cdabe62c64bd.tar.bz2 android_hardware_ril-f423cde8f901a72fd0cb811583a2cdabe62c64bd.zip |
Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE
See https://android-git.corp.google.com/g/#/c/157220
Bug: 5449033
Change-Id: Id52de89149d4580873215fafc922ec4bd8d722ed
Diffstat (limited to 'libril')
-rw-r--r-- | libril/ril.cpp | 136 | ||||
-rw-r--r-- | libril/ril_event.cpp | 2 |
2 files changed, 69 insertions, 69 deletions
diff --git a/libril/ril.cpp b/libril/ril.cpp index 836cf55..f2ea78b 100644 --- a/libril/ril.cpp +++ b/libril/ril.cpp @@ -360,12 +360,12 @@ processCommandBuffer(void *buffer, size_t buflen) { status = p.readInt32 (&token); if (status != NO_ERROR) { - LOGE("invalid request block"); + ALOGE("invalid request block"); return 0; } if (request < 1 || request >= (int32_t)NUM_ELEMS(s_commands)) { - LOGE("unsupported request code %d token %d", request, token); + ALOGE("unsupported request code %d token %d", request, token); // FIXME this should perhaps return a response return 0; } @@ -394,7 +394,7 @@ processCommandBuffer(void *buffer, size_t buflen) { static void invalidCommandBlock (RequestInfo *pRI) { - LOGE("invalid command block for token %d request %s", + ALOGE("invalid command block for token %d request %s", pRI->token, requestToString(pRI->pCI->requestNumber)); } @@ -1315,7 +1315,7 @@ blockingWrite(int fd, const void *buffer, size_t len) { if (written >= 0) { writeOffset += written; } else { // written < 0 - LOGE ("RIL Response: unexpected error on write errno:%d", errno); + ALOGE ("RIL Response: unexpected error on write errno:%d", errno); close(fd); return -1; } @@ -1335,7 +1335,7 @@ sendResponseRaw (const void *data, size_t dataSize) { } if (dataSize > MAX_COMMAND_BYTES) { - LOGE("RIL: packet larger than %u (%u)", + ALOGE("RIL: packet larger than %u (%u)", MAX_COMMAND_BYTES, (unsigned int )dataSize); return -1; @@ -1377,11 +1377,11 @@ responseInts(Parcel &p, void *response, size_t responselen) { int numInts; if (response == NULL && responselen != 0) { - LOGE("invalid response: NULL"); + ALOGE("invalid response: NULL"); return RIL_ERRNO_INVALID_RESPONSE; } if (responselen % sizeof(int) != 0) { - LOGE("invalid response length %d expected multiple of %d\n", + ALOGE("invalid response length %d expected multiple of %d\n", (int)responselen, (int)sizeof(int)); return RIL_ERRNO_INVALID_RESPONSE; } @@ -1415,11 +1415,11 @@ static int responseStrings(Parcel &p, void *response, size_t responselen) { int numStrings; if (response == NULL && responselen != 0) { - LOGE("invalid response: NULL"); + ALOGE("invalid response: NULL"); return RIL_ERRNO_INVALID_RESPONSE; } if (responselen % sizeof(char *) != 0) { - LOGE("invalid response length %d expected multiple of %d\n", + ALOGE("invalid response length %d expected multiple of %d\n", (int)responselen, (int)sizeof(char *)); return RIL_ERRNO_INVALID_RESPONSE; } @@ -1470,12 +1470,12 @@ static int responseCallList(Parcel &p, void *response, size_t responselen) { int num; if (response == NULL && responselen != 0) { - LOGE("invalid response: NULL"); + ALOGE("invalid response: NULL"); return RIL_ERRNO_INVALID_RESPONSE; } if (responselen % sizeof (RIL_Call *) != 0) { - LOGE("invalid response length %d expected multiple of %d\n", + ALOGE("invalid response length %d expected multiple of %d\n", (int)responselen, (int)sizeof (RIL_Call *)); return RIL_ERRNO_INVALID_RESPONSE; } @@ -1538,12 +1538,12 @@ static int responseCallList(Parcel &p, void *response, size_t responselen) { static int responseSMS(Parcel &p, void *response, size_t responselen) { if (response == NULL) { - LOGE("invalid response: NULL"); + ALOGE("invalid response: NULL"); return RIL_ERRNO_INVALID_RESPONSE; } if (responselen != sizeof (RIL_SMS_Response) ) { - LOGE("invalid response length %d expected %d", + ALOGE("invalid response length %d expected %d", (int)responselen, (int)sizeof (RIL_SMS_Response)); return RIL_ERRNO_INVALID_RESPONSE; } @@ -1565,12 +1565,12 @@ static int responseSMS(Parcel &p, void *response, size_t responselen) { static int responseDataCallListV4(Parcel &p, void *response, size_t responselen) { if (response == NULL && responselen != 0) { - LOGE("invalid response: NULL"); + ALOGE("invalid response: NULL"); return RIL_ERRNO_INVALID_RESPONSE; } if (responselen % sizeof(RIL_Data_Call_Response_v4) != 0) { - LOGE("invalid response length %d expected multiple of %d", + ALOGE("invalid response length %d expected multiple of %d", (int)responselen, (int)sizeof(RIL_Data_Call_Response_v4)); return RIL_ERRNO_INVALID_RESPONSE; } @@ -1608,12 +1608,12 @@ static int responseDataCallList(Parcel &p, void *response, size_t responselen) return responseDataCallListV4(p, response, responselen); } else { if (response == NULL && responselen != 0) { - LOGE("invalid response: NULL"); + ALOGE("invalid response: NULL"); return RIL_ERRNO_INVALID_RESPONSE; } if (responselen % sizeof(RIL_Data_Call_Response_v6) != 0) { - LOGE("invalid response length %d expected multiple of %d", + ALOGE("invalid response length %d expected multiple of %d", (int)responselen, (int)sizeof(RIL_Data_Call_Response_v6)); return RIL_ERRNO_INVALID_RESPONSE; } @@ -1662,7 +1662,7 @@ static int responseSetupDataCall(Parcel &p, void *response, size_t responselen) static int responseRaw(Parcel &p, void *response, size_t responselen) { if (response == NULL && responselen != 0) { - LOGE("invalid response: NULL with responselen != 0"); + ALOGE("invalid response: NULL with responselen != 0"); return RIL_ERRNO_INVALID_RESPONSE; } @@ -1680,12 +1680,12 @@ static int responseRaw(Parcel &p, void *response, size_t responselen) { static int responseSIM_IO(Parcel &p, void *response, size_t responselen) { if (response == NULL) { - LOGE("invalid response: NULL"); + ALOGE("invalid response: NULL"); return RIL_ERRNO_INVALID_RESPONSE; } if (responselen != sizeof (RIL_SIM_IO_Response) ) { - LOGE("invalid response length was %d expected %d", + ALOGE("invalid response length was %d expected %d", (int)responselen, (int)sizeof (RIL_SIM_IO_Response)); return RIL_ERRNO_INVALID_RESPONSE; } @@ -1708,12 +1708,12 @@ static int responseCallForwards(Parcel &p, void *response, size_t responselen) { int num; if (response == NULL && responselen != 0) { - LOGE("invalid response: NULL"); + ALOGE("invalid response: NULL"); return RIL_ERRNO_INVALID_RESPONSE; } if (responselen % sizeof(RIL_CallForwardInfo *) != 0) { - LOGE("invalid response length %d expected multiple of %d", + ALOGE("invalid response length %d expected multiple of %d", (int)responselen, (int)sizeof(RIL_CallForwardInfo *)); return RIL_ERRNO_INVALID_RESPONSE; } @@ -1746,12 +1746,12 @@ static int responseCallForwards(Parcel &p, void *response, size_t responselen) { static int responseSsn(Parcel &p, void *response, size_t responselen) { if (response == NULL) { - LOGE("invalid response: NULL"); + ALOGE("invalid response: NULL"); return RIL_ERRNO_INVALID_RESPONSE; } if (responselen != sizeof(RIL_SuppSvcNotification)) { - LOGE("invalid response length was %d expected %d", + ALOGE("invalid response length was %d expected %d", (int)responselen, (int)sizeof (RIL_SuppSvcNotification)); return RIL_ERRNO_INVALID_RESPONSE; } @@ -1777,12 +1777,12 @@ static int responseCellList(Parcel &p, void *response, size_t responselen) { int num; if (response == NULL && responselen != 0) { - LOGE("invalid response: NULL"); + ALOGE("invalid response: NULL"); return RIL_ERRNO_INVALID_RESPONSE; } if (responselen % sizeof (RIL_NeighboringCell *) != 0) { - LOGE("invalid response length %d expected multiple of %d\n", + ALOGE("invalid response length %d expected multiple of %d\n", (int)responselen, (int)sizeof (RIL_NeighboringCell *)); return RIL_ERRNO_INVALID_RESPONSE; } @@ -1826,12 +1826,12 @@ static int responseCdmaInformationRecords(Parcel &p, RIL_CDMA_InformationRecord *infoRec; if (response == NULL && responselen != 0) { - LOGE("invalid response: NULL"); + ALOGE("invalid response: NULL"); return RIL_ERRNO_INVALID_RESPONSE; } if (responselen != sizeof (RIL_CDMA_InformationRecords)) { - LOGE("invalid response length %d expected multiple of %d\n", + ALOGE("invalid response length %d expected multiple of %d\n", (int)responselen, (int)sizeof (RIL_CDMA_InformationRecords *)); return RIL_ERRNO_INVALID_RESPONSE; } @@ -1851,7 +1851,7 @@ static int responseCdmaInformationRecords(Parcel &p, case RIL_CDMA_EXTENDED_DISPLAY_INFO_REC: if (infoRec->rec.display.alpha_len > CDMA_ALPHA_INFO_BUFFER_LENGTH) { - LOGE("invalid display info response length %d \ + ALOGE("invalid display info response length %d \ expected not more than %d\n", (int)infoRec->rec.display.alpha_len, CDMA_ALPHA_INFO_BUFFER_LENGTH); @@ -1871,7 +1871,7 @@ static int responseCdmaInformationRecords(Parcel &p, 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) { - LOGE("invalid display info response length %d \ + ALOGE("invalid display info response length %d \ expected not more than %d\n", (int)infoRec->rec.number.len, CDMA_NUMBER_INFO_BUFFER_LENGTH); @@ -1908,7 +1908,7 @@ static int responseCdmaInformationRecords(Parcel &p, case RIL_CDMA_REDIRECTING_NUMBER_INFO_REC: if (infoRec->rec.redir.redirectingNumber.len > CDMA_NUMBER_INFO_BUFFER_LENGTH) { - LOGE("invalid display info response length %d \ + ALOGE("invalid display info response length %d \ expected not more than %d\n", (int)infoRec->rec.redir.redirectingNumber.len, CDMA_NUMBER_INFO_BUFFER_LENGTH); @@ -1963,10 +1963,10 @@ static int responseCdmaInformationRecords(Parcel &p, break; case RIL_CDMA_T53_RELEASE_INFO_REC: // TODO(Moto): See David Krause, he has the answer:) - LOGE("RIL_CDMA_T53_RELEASE_INFO_REC: return INVALID_RESPONSE"); + ALOGE("RIL_CDMA_T53_RELEASE_INFO_REC: return INVALID_RESPONSE"); return RIL_ERRNO_INVALID_RESPONSE; default: - LOGE("Incorrect name value"); + ALOGE("Incorrect name value"); return RIL_ERRNO_INVALID_RESPONSE; } } @@ -1978,7 +1978,7 @@ static int responseCdmaInformationRecords(Parcel &p, static int responseRilSignalStrength(Parcel &p, void *response, size_t responselen) { if (response == NULL && responselen != 0) { - LOGE("invalid response: NULL"); + ALOGE("invalid response: NULL"); return RIL_ERRNO_INVALID_RESPONSE; } @@ -2025,7 +2025,7 @@ static int responseRilSignalStrength(Parcel &p, closeResponse; } else { - LOGE("invalid response length"); + ALOGE("invalid response length"); return RIL_ERRNO_INVALID_RESPONSE; } @@ -2042,12 +2042,12 @@ static int responseCallRing(Parcel &p, void *response, size_t responselen) { static int responseCdmaSignalInfoRecord(Parcel &p, void *response, size_t responselen) { if (response == NULL || responselen == 0) { - LOGE("invalid response: NULL"); + ALOGE("invalid response: NULL"); return RIL_ERRNO_INVALID_RESPONSE; } if (responselen != sizeof (RIL_CDMA_SignalInfoRecord)) { - LOGE("invalid response length %d expected sizeof (RIL_CDMA_SignalInfoRecord) of %d\n", + ALOGE("invalid response length %d expected sizeof (RIL_CDMA_SignalInfoRecord) of %d\n", (int)responselen, (int)sizeof (RIL_CDMA_SignalInfoRecord)); return RIL_ERRNO_INVALID_RESPONSE; } @@ -2072,7 +2072,7 @@ static int responseCdmaSignalInfoRecord(Parcel &p, void *response, size_t respon static int responseCdmaCallWaiting(Parcel &p, void *response, size_t responselen) { if (response == NULL && responselen != 0) { - LOGE("invalid response: NULL"); + ALOGE("invalid response: NULL"); return RIL_ERRNO_INVALID_RESPONSE; } @@ -2162,7 +2162,7 @@ static int responseSimStatus(Parcel &p, void *response, size_t responselen) { int i; if (response == NULL && responselen != 0) { - LOGE("invalid response: NULL"); + ALOGE("invalid response: NULL"); return RIL_ERRNO_INVALID_RESPONSE; } @@ -2187,7 +2187,7 @@ static int responseSimStatus(Parcel &p, void *response, size_t responselen) { sendSimStatusAppInfo(p, p_cur->num_applications, p_cur->applications); } else { - LOGE("responseSimStatus: A RilCardStatus_v6 or _v5 expected\n"); + ALOGE("responseSimStatus: A RilCardStatus_v6 or _v5 expected\n"); return RIL_ERRNO_INVALID_RESPONSE; } @@ -2252,12 +2252,12 @@ static int responseCdmaSms(Parcel &p, void *response, size_t responselen) { ALOGD("Inside responseCdmaSms"); if (response == NULL && responselen != 0) { - LOGE("invalid response: NULL"); + ALOGE("invalid response: NULL"); return RIL_ERRNO_INVALID_RESPONSE; } if (responselen != sizeof(RIL_CDMA_SMS_Message)) { - LOGE("invalid response length was %d expected %d", + ALOGE("invalid response length was %d expected %d", (int)responselen, (int)sizeof(RIL_CDMA_SMS_Message)); return RIL_ERRNO_INVALID_RESPONSE; } @@ -2366,7 +2366,7 @@ static void processCommandsCallback(int fd, short flags, void *param) { if (ret == 0 || !(errno == EAGAIN || errno == EINTR)) { /* fatal error or end-of-stream */ if (ret != 0) { - LOGE("error on reading command socket errno:%d\n", errno); + ALOGE("error on reading command socket errno:%d\n", errno); } else { ALOGW("EOS. Closing command socket."); } @@ -2438,7 +2438,7 @@ static void listenCallback (int fd, short flags, void *param) { s_fdCommand = accept(s_fdListen, (sockaddr *) &peeraddr, &socklen); if (s_fdCommand < 0 ) { - LOGE("Error on accept() errno:%d", errno); + ALOGE("Error on accept() errno:%d", errno); /* start listening for new connections again */ rilEventAddWakeup(&s_listen_event); return; @@ -2459,17 +2459,17 @@ static void listenCallback (int fd, short flags, void *param) { if (strcmp(pwd->pw_name, PHONE_PROCESS) == 0) { is_phone_socket = 1; } else { - LOGE("RILD can't accept socket from process %s", pwd->pw_name); + ALOGE("RILD can't accept socket from process %s", pwd->pw_name); } } else { - LOGE("Error on getpwuid() errno: %d", errno); + ALOGE("Error on getpwuid() errno: %d", errno); } } else { ALOGD("Error on getsockopt() errno: %d", errno); } if ( !is_phone_socket ) { - LOGE("RILD must accept socket from %s", PHONE_PROCESS); + ALOGE("RILD must accept socket from %s", PHONE_PROCESS); close(s_fdCommand); s_fdCommand = -1; @@ -2485,7 +2485,7 @@ static void listenCallback (int fd, short flags, void *param) { ret = fcntl(s_fdCommand, F_SETFL, O_NONBLOCK); if (ret < 0) { - LOGE ("Error setting O_NONBLOCK errno:%d", errno); + ALOGE ("Error setting O_NONBLOCK errno:%d", errno); } ALOGI("libril: new connection"); @@ -2525,12 +2525,12 @@ static void debugCallback (int fd, short flags, void *param) { acceptFD = accept (fd, (sockaddr *) &peeraddr, &socklen); if (acceptFD < 0) { - LOGE ("error accepting on debug port: %d\n", errno); + ALOGE ("error accepting on debug port: %d\n", errno); return; } if (recv(acceptFD, &number, sizeof(int), 0) != sizeof(int)) { - LOGE ("error reading on socket: number of Args: \n"); + ALOGE ("error reading on socket: number of Args: \n"); return; } args = (char **) malloc(sizeof(char*) * number); @@ -2538,7 +2538,7 @@ static void debugCallback (int fd, short flags, void *param) { for (int i = 0; i < number; i++) { int len; if (recv(acceptFD, &len, sizeof(int), 0) != sizeof(int)) { - LOGE ("error reading on socket: Len of Args: \n"); + ALOGE ("error reading on socket: Len of Args: \n"); freeDebugCallbackArgs(i, args); return; } @@ -2546,7 +2546,7 @@ static void debugCallback (int fd, short flags, void *param) { args[i] = (char *) malloc((sizeof(char) * len) + 1); if (recv(acceptFD, args[i], sizeof(char) * len, 0) != (int)sizeof(char) * len) { - LOGE ("error reading on socket: Args[%d] \n", i); + ALOGE ("error reading on socket: Args[%d] \n", i); freeDebugCallbackArgs(i, args); return; } @@ -2629,7 +2629,7 @@ static void debugCallback (int fd, short flags, void *param) { sizeof(hangupData)); break; default: - LOGE ("Invalid request"); + ALOGE ("Invalid request"); break; } freeDebugCallbackArgs(number, args); @@ -2671,7 +2671,7 @@ eventLoop(void *param) { ret = pipe(filedes); if (ret < 0) { - LOGE("Error in pipe() errno:%d", errno); + ALOGE("Error in pipe() errno:%d", errno); return NULL; } @@ -2687,7 +2687,7 @@ eventLoop(void *param) { // Only returns on error ril_event_loop(); - LOGE ("error in event_loop_base errno:%d", errno); + ALOGE ("error in event_loop_base errno:%d", errno); // kill self to restart on error kill(0, SIGKILL); @@ -2714,7 +2714,7 @@ RIL_startEventLoop(void) { pthread_mutex_unlock(&s_startupMutex); if (ret < 0) { - LOGE("Failed to create dispatch thread errno:%d", errno); + ALOGE("Failed to create dispatch thread errno:%d", errno); return; } } @@ -2730,23 +2730,23 @@ RIL_register (const RIL_RadioFunctions *callbacks) { int flags; if (callbacks == NULL) { - LOGE("RIL_register: RIL_RadioFunctions * null"); + ALOGE("RIL_register: RIL_RadioFunctions * null"); return; } if (callbacks->version < RIL_VERSION_MIN) { - LOGE("RIL_register: version %d is to old, min version is %d", + ALOGE("RIL_register: version %d is to old, min version is %d", callbacks->version, RIL_VERSION_MIN); return; } if (callbacks->version > RIL_VERSION) { - LOGE("RIL_register: version %d is too new, max version is %d", + ALOGE("RIL_register: version %d is too new, max version is %d", callbacks->version, RIL_VERSION); return; } - LOGE("RIL_register: RIL version %d", callbacks->version); + ALOGE("RIL_register: RIL version %d", callbacks->version); if (s_registerCalled > 0) { - LOGE("RIL_register has been called more than once. " + ALOGE("RIL_register has been called more than once. " "Subsequent call ignored"); return; } @@ -2780,7 +2780,7 @@ RIL_register (const RIL_RadioFunctions *callbacks) { ANDROID_SOCKET_NAMESPACE_ABSTRACT, SOCK_STREAM); if (ret < 0) { - LOGE("Unable to bind socket errno:%d", errno); + ALOGE("Unable to bind socket errno:%d", errno); exit (-1); } s_fdListen = ret; @@ -2788,14 +2788,14 @@ RIL_register (const RIL_RadioFunctions *callbacks) { #else s_fdListen = android_get_control_socket(SOCKET_NAME_RIL); if (s_fdListen < 0) { - LOGE("Failed to get socket '" SOCKET_NAME_RIL "'"); + ALOGE("Failed to get socket '" SOCKET_NAME_RIL "'"); exit(-1); } ret = listen(s_fdListen, 4); if (ret < 0) { - LOGE("Failed to listen on control socket '%d': %s", + ALOGE("Failed to listen on control socket '%d': %s", s_fdListen, strerror(errno)); exit(-1); } @@ -2813,14 +2813,14 @@ RIL_register (const RIL_RadioFunctions *callbacks) { s_fdDebug = android_get_control_socket(SOCKET_NAME_RIL_DEBUG); if (s_fdDebug < 0) { - LOGE("Failed to get socket '" SOCKET_NAME_RIL_DEBUG "' errno:%d", errno); + ALOGE("Failed to get socket '" SOCKET_NAME_RIL_DEBUG "' errno:%d", errno); exit(-1); } ret = listen(s_fdDebug, 4); if (ret < 0) { - LOGE("Failed to listen on ril debug socket '%d': %s", + ALOGE("Failed to listen on ril debug socket '%d': %s", s_fdDebug, strerror(errno)); exit(-1); } @@ -2870,7 +2870,7 @@ RIL_onRequestComplete(RIL_Token t, RIL_Errno e, void *response, size_t responsel pRI = (RequestInfo *)t; if (!checkAndDequeueRequestInfo(pRI)) { - LOGE ("RIL_onRequestComplete: invalid RIL_Token"); + ALOGE ("RIL_onRequestComplete: invalid RIL_Token"); return; } @@ -3082,7 +3082,7 @@ void RIL_onUnsolicitedResponse(int unsolResponse, void *data, if ((unsolResponseIndex < 0) || (unsolResponseIndex >= (int32_t)NUM_ELEMS(s_unsolResponses))) { - LOGE("unsupported unsolicited response code %d", unsolResponse); + ALOGE("unsupported unsolicited response code %d", unsolResponse); return; } diff --git a/libril/ril_event.cpp b/libril/ril_event.cpp index 0679a20..93511e9 100644 --- a/libril/ril_event.cpp +++ b/libril/ril_event.cpp @@ -370,7 +370,7 @@ void ril_event_loop() if (n < 0) { if (errno == EINTR) continue; - LOGE("ril_event: select error (%d)", errno); + ALOGE("ril_event: select error (%d)", errno); // bail? return; } |