Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGE
See https://android-git.corp.google.com/g/156801
Bug: 5449033
Change-Id: I42dbe6812878b39c75babc1ba95737937f45fdcc
diff --git a/libril/ril.cpp b/libril/ril.cpp
index 4c11a15..d17a26e 100644
--- a/libril/ril.cpp
+++ b/libril/ril.cpp
@@ -2408,11 +2408,11 @@
if (s_callbacks.getVersion != NULL) {
const char *version;
version = s_callbacks.getVersion();
- LOGI("RIL Daemon version: %s\n", version);
+ ALOGI("RIL Daemon version: %s\n", version);
property_set(PROPERTY_RIL_IMPL, version);
} else {
- LOGI("RIL Daemon version: unavailable\n");
+ ALOGI("RIL Daemon version: unavailable\n");
property_set(PROPERTY_RIL_IMPL, "unavailable");
}
@@ -2488,7 +2488,7 @@
LOGE ("Error setting O_NONBLOCK errno:%d", errno);
}
- LOGI("libril: new connection");
+ ALOGI("libril: new connection");
p_rs = record_stream_new(s_fdCommand, MAX_COMMAND_BYTES);
@@ -2556,11 +2556,11 @@
switch (atoi(args[0])) {
case 0:
- LOGI ("Connection on debug port: issuing reset.");
+ ALOGI ("Connection on debug port: issuing reset.");
issueLocalRequest(RIL_REQUEST_RESET_RADIO, NULL, 0);
break;
case 1:
- LOGI ("Connection on debug port: issuing radio power off.");
+ ALOGI ("Connection on debug port: issuing radio power off.");
data = 0;
issueLocalRequest(RIL_REQUEST_RADIO_POWER, &data, sizeof(int));
// Close the socket
@@ -2568,12 +2568,12 @@
s_fdCommand = -1;
break;
case 2:
- LOGI ("Debug port: issuing unsolicited voice network change.");
+ ALOGI ("Debug port: issuing unsolicited voice network change.");
RIL_onUnsolicitedResponse(RIL_UNSOL_RESPONSE_VOICE_NETWORK_STATE_CHANGED,
NULL, 0);
break;
case 3:
- LOGI ("Debug port: QXDM log enable.");
+ ALOGI ("Debug port: QXDM log enable.");
qxdm_data[0] = 65536; // head.func_tag
qxdm_data[1] = 16; // head.len
qxdm_data[2] = 1; // mode: 1 for 'start logging'
@@ -2584,7 +2584,7 @@
6 * sizeof(int));
break;
case 4:
- LOGI ("Debug port: QXDM log disable.");
+ ALOGI ("Debug port: QXDM log disable.");
qxdm_data[0] = 65536;
qxdm_data[1] = 16;
qxdm_data[2] = 0; // mode: 0 for 'stop logging'
@@ -2595,7 +2595,7 @@
6 * sizeof(int));
break;
case 5:
- LOGI("Debug port: Radio On");
+ ALOGI("Debug port: Radio On");
data = 1;
issueLocalRequest(RIL_REQUEST_RADIO_POWER, &data, sizeof(int));
sleep(2);
@@ -2603,28 +2603,28 @@
issueLocalRequest(RIL_REQUEST_SET_NETWORK_SELECTION_AUTOMATIC, NULL, 0);
break;
case 6:
- LOGI("Debug port: Setup Data Call, Apn :%s\n", args[1]);
+ ALOGI("Debug port: Setup Data Call, Apn :%s\n", args[1]);
actData[0] = args[1];
issueLocalRequest(RIL_REQUEST_SETUP_DATA_CALL, &actData,
sizeof(actData));
break;
case 7:
- LOGI("Debug port: Deactivate Data Call");
+ ALOGI("Debug port: Deactivate Data Call");
issueLocalRequest(RIL_REQUEST_DEACTIVATE_DATA_CALL, &deactData,
sizeof(deactData));
break;
case 8:
- LOGI("Debug port: Dial Call");
+ ALOGI("Debug port: Dial Call");
dialData.clir = 0;
dialData.address = args[1];
issueLocalRequest(RIL_REQUEST_DIAL, &dialData, sizeof(dialData));
break;
case 9:
- LOGI("Debug port: Answer Call");
+ ALOGI("Debug port: Answer Call");
issueLocalRequest(RIL_REQUEST_ANSWER, NULL, 0);
break;
case 10:
- LOGI("Debug port: End Call");
+ ALOGI("Debug port: End Call");
issueLocalRequest(RIL_REQUEST_HANGUP, &hangupData,
sizeof(hangupData));
break;
diff --git a/reference-ril/reference-ril.c b/reference-ril/reference-ril.c
index f5495db..69ce6df 100644
--- a/reference-ril/reference-ril.c
+++ b/reference-ril/reference-ril.c
@@ -618,7 +618,7 @@
&& p_calls[i].state == RIL_CALL_ACTIVE
&& s_repollCallsCount < REPOLL_CALLS_COUNT_MAX
) {
- LOGI(
+ ALOGI(
"Hit WORKAROUND_ERRONOUS_ANSWER case."
" Repoll count: %d\n", s_repollCallsCount);
s_repollCallsCount++;
@@ -2026,7 +2026,7 @@
/* Called on command or reader thread */
static void onATReaderClosed()
{
- LOGI("AT channel closed\n");
+ ALOGI("AT channel closed\n");
at_close();
s_closed = 1;
@@ -2036,7 +2036,7 @@
/* Called on command thread */
static void onATTimeout()
{
- LOGI("AT channel timeout; closing\n");
+ ALOGI("AT channel timeout; closing\n");
at_close();
s_closed = 1;
@@ -2133,7 +2133,7 @@
sleep(1);
waitForClose();
- LOGI("Re-opening after close");
+ ALOGI("Re-opening after close");
}
}
@@ -2158,18 +2158,18 @@
usage(argv[0]);
return NULL;
}
- LOGI("Opening loopback port %d\n", s_port);
+ ALOGI("Opening loopback port %d\n", s_port);
break;
case 'd':
s_device_path = optarg;
- LOGI("Opening tty device %s\n", s_device_path);
+ ALOGI("Opening tty device %s\n", s_device_path);
break;
case 's':
s_device_path = optarg;
s_device_socket = 1;
- LOGI("Opening socket %s\n", s_device_path);
+ ALOGI("Opening socket %s\n", s_device_path);
break;
default:
@@ -2203,18 +2203,18 @@
if (s_port == 0) {
usage(argv[0]);
}
- LOGI("Opening loopback port %d\n", s_port);
+ ALOGI("Opening loopback port %d\n", s_port);
break;
case 'd':
s_device_path = optarg;
- LOGI("Opening tty device %s\n", s_device_path);
+ ALOGI("Opening tty device %s\n", s_device_path);
break;
case 's':
s_device_path = optarg;
s_device_socket = 1;
- LOGI("Opening socket %s\n", s_device_path);
+ ALOGI("Opening socket %s\n", s_device_path);
break;
default:
