Skip to content

GitLab

Commit f423cde8 authored by Steve Block's avatar Steve Block
Browse files

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
parent 43b9c52f
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 116 additions and 116 deletions
libril/ril.cpp
View file @ f423cde8
This diff is collapsed.
libril/ril_event.cpp
View file @ f423cde8
......@@ -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;
}
......
mock-ril/src/cpp/ctrl_server.cpp
View file @ f423cde8
......@@ -198,7 +198,7 @@ class CtrlServerThread : public WorkerThread {
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 @@ class CtrlServerThread : public WorkerThread {
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 @@ class CtrlServerThread : public WorkerThread {
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 @@ class CtrlServerThread : public WorkerThread {
// 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 @@ class CtrlServerThread : public WorkerThread {
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 @@ class CtrlServerThread : public WorkerThread {
}
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 @@ v8::Handle<v8::Value> SendCtrlRequestComplete(const v8::Arguments& args) {
*/
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 @@ void ctrlServerInit(v8::Handle<v8::Context> context) {
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 @@ void ctrlServerInit(v8::Handle<v8::Context> context) {
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");
}
......
mock-ril/src/cpp/js_support.cpp
View file @ f423cde8
......@@ -290,12 +290,12 @@ void runJs(v8::Handle<v8::Context> context, v8::TryCatch *try_catch,
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");
}
}
}
......
mock-ril/src/cpp/mock_ril.cpp
View file @ f423cde8
......@@ -280,12 +280,12 @@ void startMockRil(v8::Handle<v8::Context> context) {
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 @@ const RIL_RadioFunctions *RIL_Init(const struct RIL_Env *env, int argc,
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");
}
}
......
mock-ril/src/cpp/requests.cpp
View file @ f423cde8
......@@ -73,7 +73,7 @@ int ReqEnterSimPin(Buffer **pBuffer,
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 @@ int ReqDial(Buffer **pBuffer,
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 @@ int ReqHangUp(Buffer **pBuffer,
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 @@ int ReqSeparateConnection (Buffer **pBuffer,
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 @@ int ReqSetMute(Buffer **pBuffer,
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 @@ int ReqScreenState(Buffer **pBuffer,
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 @@ int callOnRilRequest(v8::Handle<v8::Context> context, int cmd,
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 @@ void RilRequestWorkerQueue::AddRequest (const int request,
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 @@ void testRilRequest(v8::Handle<v8::Context> context, int request, const void *da
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");
}
}
......
mock-ril/src/cpp/responses.cpp
View file @ f423cde8
......@@ -346,7 +346,7 @@ RIL_Errno RspOperator(
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 @@ v8::Handle<v8::Value> SendRilRequestComplete(const v8::Arguments& args) {
*/
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 @@ v8::Handle<v8::Value> SendRilRequestComplete(const v8::Arguments& args) {
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 @@ v8::Handle<v8::Value> SendRilUnsolicitedResponse(const v8::Arguments& args) {
*/
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 @@ v8::Handle<v8::Value> SendRilUnsolicitedResponse(const v8::Arguments& args) {
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;
......
mock-ril/src/cpp/worker.cpp
View file @ f423cde8
......@@ -96,19 +96,19 @@ int WorkerThread::Run(void *workerParam) {
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;
}
......
reference-ril/atchannel.c
View file @ f423cde8
......@@ -290,7 +290,7 @@ static void processLine(const char *line)
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 @@ static const char *readline()
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';
......
reference-ril/reference-ril.c
View file @ f423cde8
......@@ -208,7 +208,7 @@ static int callFromCLCCLine(char *line, RIL_Call *p_call)
return 0;
error:
LOGE("invalid CLCC line\n");
ALOGE("invalid CLCC line\n");
return -1;
}
......@@ -517,7 +517,7 @@ static void requestQueryNetworkSelectionMode(
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 @@ static void requestSignalStrength(void *data, size_t datalen, RIL_Token t)
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 @@ static void requestRegistrationState(int request, void *data,
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 @@ static void requestOperator(void *data, size_t datalen, RIL_Token t)
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 @@ static void requestSetupDataCall(void *data, size_t datalen, RIL_Token t)
} 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 @@ static void requestSetupDataCall(void *data, size_t datalen, RIL_Token t)
} 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 @@ static void requestSetupDataCall(void *data, size_t datalen, RIL_Token t)
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 @@ static void requestSMSAcknowledge(void *data, size_t datalen, RIL_Token t)
} 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 @@ static void onUnsolicited (const char *s, const char *sms_pdu)
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 @@ mainLoop(void *param)
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;
}
......
rild/rild.c
View file @ f423cde8
......@@ -199,7 +199,7 @@ int main(int argc, char **argv)
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);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment