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
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 @@
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 @@
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 @@
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 @@
}
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 @@
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 @@
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 @@
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 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 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 @@
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 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 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 @@
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 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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 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 @@
closeResponse;
} else {
- LOGE("invalid response length");
+ ALOGE("invalid response length");
return RIL_ERRNO_INVALID_RESPONSE;
}
@@ -2042,12 +2042,12 @@
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 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 @@
int i;
if (response == NULL && responselen != 0) {
- LOGE("invalid response: NULL");
+ ALOGE("invalid response: NULL");
return RIL_ERRNO_INVALID_RESPONSE;
}
@@ -2187,7 +2187,7 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
sizeof(hangupData));
break;
default:
- LOGE ("Invalid request");
+ ALOGE ("Invalid request");
break;
}
freeDebugCallbackArgs(number, args);
@@ -2671,7 +2671,7 @@
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 @@
// 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 @@
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 @@
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 @@
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 @@
#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 @@
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 @@
pRI = (RequestInfo *)t;
if (!checkAndDequeueRequestInfo(pRI)) {
- LOGE ("RIL_onRequestComplete: invalid RIL_Token");
+ ALOGE ("RIL_onRequestComplete: invalid RIL_Token");
return;
}
@@ -3082,7 +3082,7 @@
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 @@
if (n < 0) {
if (errno == EINTR) continue;
- LOGE("ril_event: select error (%d)", errno);
+ ALOGE("ril_event: select error (%d)", errno);
// bail?
return;
}
diff --git a/mock-ril/src/cpp/ctrl_server.cpp b/mock-ril/src/cpp/ctrl_server.cpp
index c1c3c39..3ac3a9f 100644
--- a/mock-ril/src/cpp/ctrl_server.cpp
+++ b/mock-ril/src/cpp/ctrl_server.cpp
@@ -198,7 +198,7 @@
server_accept_socket_ = socket_inaddr_any_server(
MOCK_RIL_CONTROL_SERVER_SOCKET, SOCK_STREAM);
if (server_accept_socket_ < 0) {
- LOGE("CtrlServerThread::Run error creating server_accept_socket_ '%s'",
+ ALOGE("CtrlServerThread::Run error creating server_accept_socket_ '%s'",
strerror(errno));
return STATUS_ERR;
}
@@ -207,7 +207,7 @@
stop_server_fd_ = socket_loopback_server(
MOCK_RIL_CONTROL_SERVER_STOPPING_SOCKET, SOCK_STREAM);
if (stop_server_fd_ < 0) {
- LOGE("CtrlServerThread::Run error creating stop_server_fd_ '%s'",
+ ALOGE("CtrlServerThread::Run error creating stop_server_fd_ '%s'",
strerror(errno));
return STATUS_ERR;
}
@@ -216,7 +216,7 @@
stop_client_fd_ = socket_loopback_client(
MOCK_RIL_CONTROL_SERVER_STOPPING_SOCKET, SOCK_STREAM);
if (stop_client_fd_ < 0) {
- LOGE("CtrlServerThread::Run error creating stop_client_fd_ '%s'",
+ ALOGE("CtrlServerThread::Run error creating stop_client_fd_ '%s'",
strerror(errno));
return STATUS_ERR;
}
@@ -224,7 +224,7 @@
// Accept the connection of the stop_client_fd_
stopper_fd_ = accept(stop_server_fd_, NULL, NULL);
if (stopper_fd_ < 0) {
- LOGE("CtrlServerThread::Run error accepting stop_client_fd '%s'",
+ ALOGE("CtrlServerThread::Run error accepting stop_client_fd '%s'",
strerror(errno));
return STATUS_ERR;
}
@@ -241,7 +241,7 @@
done_ = true;
int rv = send(stop_client_fd_, &done_, sizeof(done_), 0);
if (rv <= 0) {
- LOGE("CtrlServerThread::Stop could not send stop"
+ ALOGE("CtrlServerThread::Stop could not send stop"
"WE WILL PROBABLY HANG");
}
WaitUntilStopped();
@@ -308,7 +308,7 @@
}
if (status != STATUS_OK) {
- LOGE("sendToCtrlServer Error: status=%d", status);
+ ALOGE("sendToCtrlServer Error: status=%d", status);
// An error report complete now
mh->set_length_data(0);
mh->set_status(ril_proto::CTRL_STATUS_ERR);
@@ -407,7 +407,7 @@
*/
if (args.Length() < 3) {
// Expecting a reqNum, ERROR and token
- LOGE("SendCtrlRequestComplete X %d parameters"
+ ALOGE("SendCtrlRequestComplete X %d parameters"
" expecting at least 3: status, reqNum, and token",
args.Length());
return v8::Undefined();
@@ -448,7 +448,7 @@
g_ctrl_server = new CtrlServerThread(context);
status = g_ctrl_server->Run();
if (status != STATUS_OK) {
- LOGE("mock_ril control server could not start");
+ ALOGE("mock_ril control server could not start");
} else {
ALOGD("CtrlServer started");
}
@@ -465,7 +465,7 @@
g_ctrl_server = new CtrlServerThread(context);
status = g_ctrl_server->Run();
if (status != STATUS_OK) {
- LOGE("mock_ril control server could not start");
+ ALOGE("mock_ril control server could not start");
} else {
DBG("mock_ril control server started");
}
diff --git a/mock-ril/src/cpp/js_support.cpp b/mock-ril/src/cpp/js_support.cpp
index bca0a33..ec10e38 100644
--- a/mock-ril/src/cpp/js_support.cpp
+++ b/mock-ril/src/cpp/js_support.cpp
@@ -290,12 +290,12 @@
v8::Handle<v8::Script> script = v8::Script::Compile(
v8::String::New(code), v8::String::New(fileName));
if (try_catch->HasCaught()) {
- LOGE("-- Compiling the source failed");
+ ALOGE("-- Compiling the source failed");
} else {
// Run the resulting script
v8::Handle<v8::Value> result = script->Run();
if (try_catch->HasCaught()) {
- LOGE("-- Running the script failed");
+ ALOGE("-- Running the script failed");
}
}
}
diff --git a/mock-ril/src/cpp/mock_ril.cpp b/mock-ril/src/cpp/mock_ril.cpp
index 646c322..7c199c9 100644
--- a/mock-ril/src/cpp/mock_ril.cpp
+++ b/mock-ril/src/cpp/mock_ril.cpp
@@ -280,12 +280,12 @@
v8::Handle<v8::Value> result = start->Call(context->Global(), 0, NULL);
if (try_catch.HasCaught()) {
- LOGE("startMockRil error");
+ ALOGE("startMockRil error");
ReportException(&try_catch);
- LOGE("FATAL ERROR: Unsable to startMockRil.");
+ ALOGE("FATAL ERROR: Unsable to startMockRil.");
} else {
v8::String::Utf8Value result_string(result);
- LOGE("startMockRil result=%s", ToCString(result_string));
+ ALOGE("startMockRil result=%s", ToCString(result_string));
}
}
@@ -326,7 +326,7 @@
runJs(context, &try_catch, "mock_ril.js", buffer);
if (try_catch.HasCaught()) {
// TODO: Change to event this is fatal
- LOGE("FATAL ERROR: Unable to run mock_ril.js");
+ ALOGE("FATAL ERROR: Unable to run mock_ril.js");
}
}
diff --git a/mock-ril/src/cpp/requests.cpp b/mock-ril/src/cpp/requests.cpp
index 5fda19c..72cbd00 100644
--- a/mock-ril/src/cpp/requests.cpp
+++ b/mock-ril/src/cpp/requests.cpp
@@ -73,7 +73,7 @@
DBG("ReqEnterSimPin E");
if (datalen < sizeof(int)) {
- LOGE("ReqEnterSimPin: data to small err size < sizeof int");
+ ALOGE("ReqEnterSimPin: data to small err size < sizeof int");
status = STATUS_BAD_DATA;
} else {
ril_proto::ReqEnterSimPin *req = new ril_proto::ReqEnterSimPin();
@@ -101,7 +101,7 @@
DBG("data=%p datalen=%d t=%p", data, datalen, t);
if (datalen < sizeof(int)) {
- LOGE("ReqDial: data to small err size < sizeof int");
+ ALOGE("ReqDial: data to small err size < sizeof int");
status = STATUS_BAD_DATA;
} else {
ril_proto::ReqDial *req = new ril_proto::ReqDial();
@@ -158,7 +158,7 @@
DBG("ReqHangUp E");
if (datalen < sizeof(int)) {
- LOGE("ReqHangUp: data to small err size < sizeof int");
+ ALOGE("ReqHangUp: data to small err size < sizeof int");
status = STATUS_BAD_DATA;
} else {
ril_proto::ReqHangUp *req = new ril_proto::ReqHangUp();
@@ -185,7 +185,7 @@
DBG("ReqSeparateConnection E");
if (datalen < sizeof(int)) {
- LOGE("ReqSetMute: data to small err size < sizeof int");
+ ALOGE("ReqSetMute: data to small err size < sizeof int");
status = STATUS_BAD_DATA;
} else {
ril_proto::ReqSeparateConnection *req = new ril_proto::ReqSeparateConnection();
@@ -213,7 +213,7 @@
DBG("ReqSetMute E");
if (datalen < sizeof(int)) {
- LOGE("ReqSetMute: data to small err size < sizeof int");
+ ALOGE("ReqSetMute: data to small err size < sizeof int");
status = STATUS_BAD_DATA;
} else {
ril_proto::ReqSetMute *req = new ril_proto::ReqSetMute();
@@ -242,7 +242,7 @@
DBG("ReqScreenState E data=%p datalen=%d t=%p",
data, datalen, t);
if (datalen < sizeof(int)) {
- LOGE("ReqScreenState: data to small err size < sizeof int");
+ ALOGE("ReqScreenState: data to small err size < sizeof int");
status = STATUS_BAD_DATA;
} else {
ril_proto::ReqScreenState *req = new ril_proto::ReqScreenState();
@@ -293,7 +293,7 @@
v8::Handle<v8::Value> result =
onRilRequestFunction->Call(context->Global(), argc, argv);
if (try_catch.HasCaught()) {
- LOGE("callOnRilRequest error");
+ ALOGE("callOnRilRequest error");
ReportException(&try_catch);
status = STATUS_ERR;
} else {
@@ -350,7 +350,7 @@
if (itr != rilReqConversionMap.end()) {
status = itr->second(&buffer, data, datalen, token);
} else {
- LOGE("RilRequestWorkerQueue:AddRequest: X unknown request %d", request);
+ ALOGE("RilRequestWorkerQueue:AddRequest: X unknown request %d", request);
status = STATUS_UNSUPPORTED_REQUEST;
}
@@ -452,13 +452,13 @@
if (itr != rilReqConversionMap.end()) {
status = itr->second(&buffer, data, sizeof(data), (void *)0x12345677);
} else {
- LOGE("testRequests X unknown request %d", request);
+ ALOGE("testRequests X unknown request %d", request);
status = STATUS_UNSUPPORTED_REQUEST;
}
if (status == STATUS_OK) {
callOnRilRequest(context, request, buffer, (void *)0x12345677);
} else {
- LOGE("testRilRequest X, serialize error");
+ ALOGE("testRilRequest X, serialize error");
}
}
diff --git a/mock-ril/src/cpp/responses.cpp b/mock-ril/src/cpp/responses.cpp
index fdf06fc..89ca488 100644
--- a/mock-ril/src/cpp/responses.cpp
+++ b/mock-ril/src/cpp/responses.cpp
@@ -346,7 +346,7 @@
void UnsolRspSignalStrength(int cmd, Buffer* buffer) {
DBG("UnsolRspSignalStrength E");
- LOGE("unsolicited response command: %d", cmd);
+ ALOGE("unsolicited response command: %d", cmd);
// Retrieve response from response message
ril_proto::RspSignalStrength *rsp = new ril_proto::RspSignalStrength();
rsp->ParseFromArray(buffer->data(), buffer->length());
@@ -395,7 +395,7 @@
*/
if (args.Length() < REQUEST_COMPLETE_REQUIRED_CMDS) {
// Expecting a cmd, ERROR and token
- LOGE("SendRilRequestComplete X %d parameters"
+ ALOGE("SendRilRequestComplete X %d parameters"
" expecting at least %d: rilErrno, cmd, and token",
args.Length(), REQUEST_COMPLETE_REQUIRED_CMDS);
return v8::Undefined();
@@ -430,7 +430,7 @@
rilErrno = RIL_E_SUCCESS;
} else {
// There was a buffer but we don't support the resonse yet.
- LOGE("SendRilRequestComplete: No conversion routine for cmd %d,"
+ ALOGE("SendRilRequestComplete: No conversion routine for cmd %d,"
" return RIL_E_REQUEST_NOT_SUPPORTED", cmd);
rilErrno = RIL_E_REQUEST_NOT_SUPPORTED;
}
@@ -462,7 +462,7 @@
*/
if (args.Length() < UNSOL_RESPONSE_REQUIRED_CMDS) {
// Expecting a cmd
- LOGE("SendRilUnsolicitedResponse X %d parameters"
+ ALOGE("SendRilUnsolicitedResponse X %d parameters"
" expecting at least a cmd",
args.Length());
return v8::Undefined();
@@ -488,7 +488,7 @@
datalen = 0;
} else {
// There was a buffer but we don't support the response yet.
- LOGE("SendRilUnsolicitedResponse: No conversion routine for cmd %d,"
+ ALOGE("SendRilUnsolicitedResponse: No conversion routine for cmd %d,"
" return RIL_E_REQUEST_NOT_SUPPORTED", cmd);
data = NULL;
datalen = 0;
diff --git a/mock-ril/src/cpp/worker.cpp b/mock-ril/src/cpp/worker.cpp
index 1508a52..63eda56 100644
--- a/mock-ril/src/cpp/worker.cpp
+++ b/mock-ril/src/cpp/worker.cpp
@@ -96,19 +96,19 @@
ret = pthread_attr_init(&attr_);
if (ret != 0) {
- LOGE("RIL_Init X: pthread_attr_init failed err=%s", strerror(ret));
+ ALOGE("RIL_Init X: pthread_attr_init failed err=%s", strerror(ret));
return STATUS_ERR;
}
ret = pthread_attr_setdetachstate(&attr_, PTHREAD_CREATE_DETACHED);
if (ret != 0) {
- LOGE("RIL_Init X: pthread_attr_setdetachstate failed err=%s",
+ ALOGE("RIL_Init X: pthread_attr_setdetachstate failed err=%s",
strerror(ret));
return STATUS_ERR;
}
ret = pthread_create(&tid_, &attr_,
(void * (*)(void *))&WorkerThread::Work, this);
if (ret != 0) {
- LOGE("RIL_Init X: pthread_create failed err=%s", strerror(ret));
+ ALOGE("RIL_Init X: pthread_create failed err=%s", strerror(ret));
return STATUS_ERR;
}
diff --git a/reference-ril/atchannel.c b/reference-ril/atchannel.c
index 410ad0e..5e7a1c1 100644
--- a/reference-ril/atchannel.c
+++ b/reference-ril/atchannel.c
@@ -290,7 +290,7 @@
break;
default: /* this should never be reached */
- LOGE("Unsupported AT command type %d\n", s_type);
+ ALOGE("Unsupported AT command type %d\n", s_type);
handleUnsolicited(line);
break;
}
@@ -371,7 +371,7 @@
while (p_eol == NULL) {
if (0 == MAX_AT_RESPONSE - (p_read - s_ATBuffer)) {
- LOGE("ERROR: Input line exceeded buffer\n");
+ ALOGE("ERROR: Input line exceeded buffer\n");
/* ditch buffer and start over again */
s_ATBufferCur = s_ATBuffer;
*s_ATBufferCur = '\0';
diff --git a/reference-ril/reference-ril.c b/reference-ril/reference-ril.c
index 69ce6df..aa8296c 100644
--- a/reference-ril/reference-ril.c
+++ b/reference-ril/reference-ril.c
@@ -208,7 +208,7 @@
return 0;
error:
- LOGE("invalid CLCC line\n");
+ ALOGE("invalid CLCC line\n");
return -1;
}
@@ -517,7 +517,7 @@
return;
error:
at_response_free(p_response);
- LOGE("requestQueryNetworkSelectionMode must never return error when radio is on");
+ ALOGE("requestQueryNetworkSelectionMode must never return error when radio is on");
RIL_onRequestComplete(t, RIL_E_GENERIC_FAILURE, NULL, 0);
}
@@ -757,7 +757,7 @@
return;
error:
- LOGE("requestSignalStrength must never return an error when radio is on");
+ ALOGE("requestSignalStrength must never return an error when radio is on");
RIL_onRequestComplete(t, RIL_E_GENERIC_FAILURE, NULL, 0);
at_response_free(p_response);
}
@@ -892,7 +892,7 @@
return;
error:
- LOGE("requestRegistrationState must never return an error when radio is on");
+ ALOGE("requestRegistrationState must never return an error when radio is on");
RIL_onRequestComplete(t, RIL_E_GENERIC_FAILURE, NULL, 0);
at_response_free(p_response);
}
@@ -963,7 +963,7 @@
return;
error:
- LOGE("requestOperator must not return error when radio is on");
+ ALOGE("requestOperator must not return error when radio is on");
RIL_onRequestComplete(t, RIL_E_GENERIC_FAILURE, NULL, 0);
at_response_free(p_response);
}
@@ -1048,7 +1048,7 @@
} while (written < 0 && errno == EINTR);
if (written < 0) {
- LOGE("### ERROR writing to /dev/qmi");
+ ALOGE("### ERROR writing to /dev/qmi");
close(fd);
goto error;
}
@@ -1065,7 +1065,7 @@
} while (rlen < 0 && errno == EINTR);
if (rlen < 0) {
- LOGE("### ERROR reading from /dev/qmi");
+ ALOGE("### ERROR reading from /dev/qmi");
close(fd);
goto error;
} else {
@@ -1077,7 +1077,7 @@
close(fd);
if (retry == 0) {
- LOGE("### Failed to get data connection up\n");
+ ALOGE("### Failed to get data connection up\n");
goto error;
}
@@ -1143,7 +1143,7 @@
} else if (ackSuccess == 0) {
err = at_send_command("AT+CNMA=2", NULL);
} else {
- LOGE("unsupported arg to RIL_REQUEST_SMS_ACKNOWLEDGE\n");
+ ALOGE("unsupported arg to RIL_REQUEST_SMS_ACKNOWLEDGE\n");
goto error;
}
@@ -1975,7 +1975,7 @@
err = at_tok_nextstr(&line, &response);
if (err != 0) {
- LOGE("invalid NITZ line %s\n", s);
+ ALOGE("invalid NITZ line %s\n", s);
} else {
RIL_onUnsolicitedResponse (
RIL_UNSOL_NITZ_TIME_RECEIVED,
@@ -2122,7 +2122,7 @@
ret = at_open(fd, onUnsolicited);
if (ret < 0) {
- LOGE ("AT error %d on at_open\n", ret);
+ ALOGE ("AT error %d on at_open\n", ret);
return 0;
}
diff --git a/rild/rild.c b/rild/rild.c
index 9a1975e..77dec1e 100644
--- a/rild/rild.c
+++ b/rild/rild.c
@@ -199,7 +199,7 @@
break;
}
if (!done) {
- LOGE("could not connect to %s socket (giving up): %s",
+ ALOGE("could not connect to %s socket (giving up): %s",
QEMUD_SOCKET_NAME, strerror(errno));
while(1)
sleep(0x00ffffff);