Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGE
Bug: 5449033
Change-Id: I1e070511b6a538e9f1c94657356437a457d58882
diff --git a/nexus/CommandListener.cpp b/nexus/CommandListener.cpp
index 5973ff5..5c50acc 100644
--- a/nexus/CommandListener.cpp
+++ b/nexus/CommandListener.cpp
@@ -213,7 +213,7 @@
if (!NetworkManager::Instance()->getPropMngr()->get((*it),
p_v,
sizeof(p_v))) {
- LOGW("Failed to get %s (%s)", (*it), strerror(errno));
+ ALOGW("Failed to get %s (%s)", (*it), strerror(errno));
}
char *buf;
diff --git a/nexus/Controller.cpp b/nexus/Controller.cpp
index f6a2436..4f4c473 100644
--- a/nexus/Controller.cpp
+++ b/nexus/Controller.cpp
@@ -86,7 +86,7 @@
}
if (rc != 0) {
- LOGW("Unable to unload kernel driver '%s' (%s)", modtag,
+ ALOGW("Unable to unload kernel driver '%s' (%s)", modtag,
strerror(errno));
}
return rc;
@@ -105,7 +105,7 @@
char *endTag = strchr(line, ' ');
if (!endTag) {
- LOGW("Unable to find tag for line '%s'", line);
+ ALOGW("Unable to find tag for line '%s'", line);
continue;
}
if (!strncmp(line, modtag, (endTag - line))) {
diff --git a/nexus/DhcpClient.cpp b/nexus/DhcpClient.cpp
index 71c2d8a..02adf91 100644
--- a/nexus/DhcpClient.cpp
+++ b/nexus/DhcpClient.cpp
@@ -126,7 +126,7 @@
close(mListenerSocket);
if (mServiceManager->stop("dhcpcd")) {
- LOGW("Failed to stop DHCP service (%s)", strerror(errno));
+ ALOGW("Failed to stop DHCP service (%s)", strerror(errno));
// XXX: Kill it the hard way.. but its gotta go!
}
diff --git a/nexus/DhcpEvent.cpp b/nexus/DhcpEvent.cpp
index 58893f4..2f1ce6f 100644
--- a/nexus/DhcpEvent.cpp
+++ b/nexus/DhcpEvent.cpp
@@ -50,7 +50,7 @@
else if (!strcasecmp(buffer, "TIMEOUT"))
return DhcpEvent::TIMEOUT;
else {
- LOGW("Bad event '%s'", buffer);
+ ALOGW("Bad event '%s'", buffer);
return -1;
}
}
diff --git a/nexus/DhcpListener.cpp b/nexus/DhcpListener.cpp
index afa68eb..16c369b 100644
--- a/nexus/DhcpListener.cpp
+++ b/nexus/DhcpListener.cpp
@@ -42,7 +42,7 @@
int rc;
if ((rc = read(cli->getSocket(), buffer, sizeof(buffer))) < 0) {
- LOGW("Error reading dhcp status msg (%s)", strerror(errno));
+ ALOGW("Error reading dhcp status msg (%s)", strerror(errno));
return true;
}
@@ -53,7 +53,7 @@
for (i = 0; i < 2; i++) {
if (!(tmp = strsep(&next, ":"))) {
- LOGW("Error parsing state '%s'", buffer);
+ ALOGW("Error parsing state '%s'", buffer);
return true;
}
}
@@ -65,22 +65,22 @@
struct in_addr ipaddr, netmask, gateway, broadcast, dns1, dns2;
if (!inet_aton(strsep(&next, ":"), &ipaddr)) {
- LOGW("Malformatted IP specified");
+ ALOGW("Malformatted IP specified");
}
if (!inet_aton(strsep(&next, ":"), &netmask)) {
- LOGW("Malformatted netmask specified");
+ ALOGW("Malformatted netmask specified");
}
if (!inet_aton(strsep(&next, ":"), &broadcast)) {
- LOGW("Malformatted broadcast specified");
+ ALOGW("Malformatted broadcast specified");
}
if (!inet_aton(strsep(&next, ":"), &gateway)) {
- LOGW("Malformatted gateway specified");
+ ALOGW("Malformatted gateway specified");
}
if (!inet_aton(strsep(&next, ":"), &dns1)) {
- LOGW("Malformatted dns1 specified");
+ ALOGW("Malformatted dns1 specified");
}
if (!inet_aton(strsep(&next, ":"), &dns2)) {
- LOGW("Malformatted dns2 specified");
+ ALOGW("Malformatted dns2 specified");
}
mHandlers->onDhcpLeaseUpdated(mController, &ipaddr, &netmask,
&broadcast, &gateway, &dns1, &dns2);
@@ -92,7 +92,7 @@
for (i = 0; i < 2; i++) {
if (!(tmp = strsep(&next, ":"))) {
- LOGW("Error parsing event '%s'", buffer);
+ ALOGW("Error parsing event '%s'", buffer);
return true;
}
}
@@ -101,7 +101,7 @@
mHandlers->onDhcpEvent(mController, ev);
} else {
- LOGW("Unknown DHCP monitor msg '%s'", buffer);
+ ALOGW("Unknown DHCP monitor msg '%s'", buffer);
}
return true;
diff --git a/nexus/DhcpState.cpp b/nexus/DhcpState.cpp
index c9d5135..b86c186 100644
--- a/nexus/DhcpState.cpp
+++ b/nexus/DhcpState.cpp
@@ -74,7 +74,7 @@
else if (!strcasecmp(buffer, "ANNOUNCING"))
return DhcpState::ANNOUNCING;
else {
- LOGW("Bad state '%s'", buffer);
+ ALOGW("Bad state '%s'", buffer);
return -1;
}
}
diff --git a/nexus/NetworkManager.cpp b/nexus/NetworkManager.cpp
index 8ea36f8..78ccbd8 100644
--- a/nexus/NetworkManager.cpp
+++ b/nexus/NetworkManager.cpp
@@ -49,7 +49,7 @@
int NetworkManager::run() {
if (startControllers()) {
- LOGW("Unable to start all controllers (%s)", strerror(errno));
+ ALOGW("Unable to start all controllers (%s)", strerror(errno));
}
return 0;
}
diff --git a/nexus/Property.cpp b/nexus/Property.cpp
index d02769d..821d22f 100644
--- a/nexus/Property.cpp
+++ b/nexus/Property.cpp
@@ -30,7 +30,7 @@
mName(name), mReadOnly(readOnly), mType(type),
mNumElements(numElements) {
if (index(name, '.')) {
- LOGW("Property name %s violates namespace rules", name);
+ ALOGW("Property name %s violates namespace rules", name);
}
}
@@ -67,7 +67,7 @@
int StringPropertyHelper::set(int idx, const char *value) {
if (idx != 0) {
- LOGW("Attempt to use array index on StringPropertyHelper::set");
+ ALOGW("Attempt to use array index on StringPropertyHelper::set");
errno = EINVAL;
return -1;
}
@@ -77,7 +77,7 @@
int StringPropertyHelper::get(int idx, char *buffer, size_t max) {
if (idx != 0) {
- LOGW("Attempt to use array index on StringPropertyHelper::get");
+ ALOGW("Attempt to use array index on StringPropertyHelper::get");
errno = EINVAL;
return -1;
}
@@ -118,7 +118,7 @@
int IntegerPropertyHelper::set(int idx, int value) {
if (idx != 0) {
- LOGW("Attempt to use array index on IntegerPropertyHelper::set");
+ ALOGW("Attempt to use array index on IntegerPropertyHelper::set");
errno = EINVAL;
return -1;
}
@@ -128,7 +128,7 @@
int IntegerPropertyHelper::get(int idx, int *buffer) {
if (idx != 0) {
- LOGW("Attempt to use array index on IntegerPropertyHelper::get");
+ ALOGW("Attempt to use array index on IntegerPropertyHelper::get");
errno = EINVAL;
return -1;
}
@@ -169,7 +169,7 @@
int IPV4AddressPropertyHelper::set(int idx, struct in_addr *value) {
if (idx != 0) {
- LOGW("Attempt to use array index on IPV4AddressPropertyHelper::set");
+ ALOGW("Attempt to use array index on IPV4AddressPropertyHelper::set");
errno = EINVAL;
return -1;
}
@@ -179,7 +179,7 @@
int IPV4AddressPropertyHelper::get(int idx, struct in_addr *buffer) {
if (idx != 0) {
- LOGW("Attempt to use array index on IPV4AddressPropertyHelper::get");
+ ALOGW("Attempt to use array index on IPV4AddressPropertyHelper::get");
errno = EINVAL;
return -1;
}
diff --git a/nexus/PropertyManager.cpp b/nexus/PropertyManager.cpp
index dbfb832..1caaba6 100644
--- a/nexus/PropertyManager.cpp
+++ b/nexus/PropertyManager.cpp
@@ -157,7 +157,7 @@
if (p->getType() == Property::Type_STRING) {
if (p->get(idx, buffer, max)) {
- LOGW("String property %s get failed (%s)", p->getName(),
+ ALOGW("String property %s get failed (%s)", p->getName(),
strerror(errno));
return -1;
}
@@ -165,7 +165,7 @@
else if (p->getType() == Property::Type_INTEGER) {
int tmp;
if (p->get(idx, &tmp)) {
- LOGW("Integer property %s get failed (%s)", p->getName(),
+ ALOGW("Integer property %s get failed (%s)", p->getName(),
strerror(errno));
return -1;
}
@@ -173,7 +173,7 @@
} else if (p->getType() == Property::Type_IPV4) {
struct in_addr tmp;
if (p->get(idx, &tmp)) {
- LOGW("IPV4 property %s get failed (%s)", p->getName(),
+ ALOGW("IPV4 property %s get failed (%s)", p->getName(),
strerror(errno));
return -1;
}
diff --git a/nexus/ScanResult.cpp b/nexus/ScanResult.cpp
index e9a286c..72cb164 100644
--- a/nexus/ScanResult.cpp
+++ b/nexus/ScanResult.cpp
@@ -74,7 +74,7 @@
return;
out_bad:
- LOGW("Malformatted scan result (%s)", rawResult);
+ ALOGW("Malformatted scan result (%s)", rawResult);
}
ScanResult::~ScanResult() {
diff --git a/nexus/Supplicant.cpp b/nexus/Supplicant.cpp
index 9fa3b54..f5298f7 100644
--- a/nexus/Supplicant.cpp
+++ b/nexus/Supplicant.cpp
@@ -64,7 +64,7 @@
int Supplicant::start() {
if (setupConfig()) {
- LOGW("Unable to setup supplicant.conf");
+ ALOGW("Unable to setup supplicant.conf");
}
if (mServiceManager->start(SUPPLICANT_SERVICE_NAME)) {
@@ -89,12 +89,12 @@
int Supplicant::stop() {
if (mListener->stopListener()) {
- LOGW("Unable to stop supplicant listener (%s)", strerror(errno));
+ ALOGW("Unable to stop supplicant listener (%s)", strerror(errno));
return -1;
}
if (mServiceManager->stop(SUPPLICANT_SERVICE_NAME)) {
- LOGW("Error stopping supplicant (%s)", strerror(errno));
+ ALOGW("Error stopping supplicant (%s)", strerror(errno));
}
if (mCtrl) {
@@ -178,7 +178,7 @@
char *linep_next = NULL;
if (!strtok_r(reply, "\n", &linep_next)) {
- LOGW("Malformatted network list\n");
+ ALOGW("Malformatted network list\n");
free(reply);
errno = EIO;
return -1;
@@ -199,7 +199,7 @@
if ((merge_wn = this->lookupNetwork_UNLOCKED(new_wn->getNetworkId()))) {
num_refreshed++;
if (merge_wn->refresh()) {
- LOGW("Error refreshing network %d (%s)",
+ ALOGW("Error refreshing network %d (%s)",
merge_wn->getNetworkId(), strerror(errno));
}
delete new_wn;
@@ -210,7 +210,7 @@
new_wn->attachProperties(pm, new_ns);
mNetworks->push_back(new_wn);
if (new_wn->refresh()) {
- LOGW("Unable to refresh network id %d (%s)",
+ ALOGW("Unable to refresh network id %d (%s)",
new_wn->getNetworkId(), strerror(errno));
}
}
@@ -243,7 +243,7 @@
int Supplicant::connectToSupplicant() {
if (!isStarted())
- LOGW("Supplicant service not running");
+ ALOGW("Supplicant service not running");
mCtrl = wpa_ctrl_open("tiwlan0"); // XXX:
if (mCtrl == NULL) {
@@ -280,7 +280,7 @@
if (sendCommand((active ? "DRIVER SCAN-ACTIVE" : "DRIVER SCAN-PASSIVE"),
reply, &len)) {
- LOGW("triggerScan(%d): Error setting scan mode (%s)", active,
+ ALOGW("triggerScan(%d): Error setting scan mode (%s)", active,
strerror(errno));
return -1;
}
@@ -292,7 +292,7 @@
size_t len = sizeof(reply);
if (sendCommand("SCAN", reply, &len)) {
- LOGW("triggerScan(): Error initiating scan");
+ ALOGW("triggerScan(): Error initiating scan");
return -1;
}
return 0;
@@ -303,7 +303,7 @@
size_t len = sizeof(reply);
if (sendCommand("DRIVER RSSI", reply, &len)) {
- LOGW("Failed to get RSSI (%s)", strerror(errno));
+ ALOGW("Failed to get RSSI (%s)", strerror(errno));
return -1;
}
@@ -325,7 +325,7 @@
size_t len = sizeof(reply);
if (sendCommand("DRIVER LINKSPEED", reply, &len)) {
- LOGW("Failed to get LINKSPEED (%s)", strerror(errno));
+ ALOGW("Failed to get LINKSPEED (%s)", strerror(errno));
return -1;
}
@@ -353,7 +353,7 @@
ALOGD("stopDriver()");
if (sendCommand("DRIVER STOP", reply, &len)) {
- LOGW("Failed to stop driver (%s)", strerror(errno));
+ ALOGW("Failed to stop driver (%s)", strerror(errno));
return -1;
}
return 0;
@@ -365,7 +365,7 @@
ALOGD("startDriver()");
if (sendCommand("DRIVER START", reply, &len)) {
- LOGW("Failed to start driver (%s)", strerror(errno));
+ ALOGW("Failed to start driver (%s)", strerror(errno));
return -1;
}
return 0;
diff --git a/nexus/SupplicantEventFactory.cpp b/nexus/SupplicantEventFactory.cpp
index 8695aca..f91db15 100644
--- a/nexus/SupplicantEventFactory.cpp
+++ b/nexus/SupplicantEventFactory.cpp
@@ -57,9 +57,9 @@
level = atoi(tmp);
event += (match - event) + 1;
} else
- LOGW("Unclosed level brace in event");
+ ALOGW("Unclosed level brace in event");
} else
- LOGW("No level specified in event");
+ ALOGW("No level specified in event");
/*
* <N>CTRL-EVENT-XXX
diff --git a/nexus/SupplicantListener.cpp b/nexus/SupplicantListener.cpp
index 092f2d9..b59a7a8 100644
--- a/nexus/SupplicantListener.cpp
+++ b/nexus/SupplicantListener.cpp
@@ -63,7 +63,7 @@
SupplicantEvent *evt = mFactory->createEvent(buf, nread);
if (!evt) {
- LOGW("Dropping unknown supplicant event '%s'", buf);
+ ALOGW("Dropping unknown supplicant event '%s'", buf);
return true;
}
@@ -83,7 +83,7 @@
else if (evt->getType() == SupplicantEvent::EVENT_DISCONNECTED)
mHandlers->onDisconnectedEvent((SupplicantDisconnectedEvent *) evt);
else
- LOGW("Whoops - no handler available for event '%s'\n", buf);
+ ALOGW("Whoops - no handler available for event '%s'\n", buf);
#if 0
else if (evt->getType() == SupplicantEvent::EVENT_TERMINATING)
mHandlers->onTerminatingEvent(evt);
diff --git a/nexus/SupplicantStateChangeEvent.cpp b/nexus/SupplicantStateChangeEvent.cpp
index cf0b9da..fd9233a 100644
--- a/nexus/SupplicantStateChangeEvent.cpp
+++ b/nexus/SupplicantStateChangeEvent.cpp
@@ -28,7 +28,7 @@
// XXX: move this stuff into a static creation method
char *p = index(event, ' ');
if (!p) {
- LOGW("Bad event '%s'\n", event);
+ ALOGW("Bad event '%s'\n", event);
return;
}
diff --git a/nexus/TiwlanEventListener.cpp b/nexus/TiwlanEventListener.cpp
index 16c63c1..4851e28 100644
--- a/nexus/TiwlanEventListener.cpp
+++ b/nexus/TiwlanEventListener.cpp
@@ -47,9 +47,9 @@
*spd /= 2;
// ALOGD("Link speed = %u MB/s", *spd);
} else if (data->event_type == IPC_EVENT_LOW_SNR) {
- LOGW("Low signal/noise ratio");
+ ALOGW("Low signal/noise ratio");
} else if (data->event_type == IPC_EVENT_LOW_RSSI) {
- LOGW("Low RSSI");
+ ALOGW("Low RSSI");
} else {
// ALOGD("Dropping unhandled driver event %d", data->event_type);
}
diff --git a/nexus/TiwlanWifiController.cpp b/nexus/TiwlanWifiController.cpp
index 384f136..311bf16 100644
--- a/nexus/TiwlanWifiController.cpp
+++ b/nexus/TiwlanWifiController.cpp
@@ -78,7 +78,7 @@
ALOGD("Firmware loaded OK");
if (startDriverEventListener()) {
- LOGW("Failed to start driver event listener (%s)",
+ ALOGW("Failed to start driver event listener (%s)",
strerror(errno));
}
diff --git a/nexus/WifiController.cpp b/nexus/WifiController.cpp
index 18891ce..e11f668 100644
--- a/nexus/WifiController.cpp
+++ b/nexus/WifiController.cpp
@@ -149,9 +149,9 @@
}
if (mSupplicant->refreshNetworkList())
- LOGW("Error getting list of networks (%s)", strerror(errno));
+ ALOGW("Error getting list of networks (%s)", strerror(errno));
- LOGW("TODO: Set # of allowed regulatory channels!");
+ ALOGW("TODO: Set # of allowed regulatory channels!");
mPropMngr->attachProperty("wifi", mDynamicProperties.propSupplicantState);
mPropMngr->attachProperty("wifi", mDynamicProperties.propActiveScan);
@@ -195,7 +195,7 @@
pthread_mutex_lock(&mLock);
if (suspend == mSuspended) {
- LOGW("Suspended state already = %d", suspend);
+ ALOGW("Suspended state already = %d", suspend);
pthread_mutex_unlock(&mLock);
return 0;
}
@@ -212,7 +212,7 @@
if (mSupplicantState != SupplicantState::IDLE) {
ALOGD("Forcing Supplicant disconnect");
if (mSupplicant->disconnect()) {
- LOGW("Error disconnecting (%s)", strerror(errno));
+ ALOGW("Error disconnecting (%s)", strerror(errno));
}
}
@@ -273,7 +273,7 @@
return -1;
}
} else
- LOGW("disable(): Supplicant not running?");
+ ALOGW("disable(): Supplicant not running?");
if (mModuleName[0] != '\0' && isKernelModuleLoaded(mModuleName)) {
sendStatusBroadcast("Unloading WiFi driver");
@@ -444,20 +444,20 @@
if (ss->getWpaState() != SupplicantState::COMPLETED) {
char tmp[32];
- LOGW("onConnected() with SupplicantState = %s!",
+ ALOGW("onConnected() with SupplicantState = %s!",
SupplicantState::toString(ss->getWpaState(), tmp,
sizeof(tmp)));
return;
}
if (ss->getId() == -1) {
- LOGW("onConnected() with id = -1!");
+ ALOGW("onConnected() with id = -1!");
return;
}
mCurrentlyConnectedNetworkId = ss->getId();
if (!(wn = mSupplicant->lookupNetwork(ss->getId()))) {
- LOGW("Error looking up connected network id %d (%s)",
+ ALOGW("Error looking up connected network id %d (%s)",
ss->getId(), strerror(errno));
return;
}
@@ -481,7 +481,7 @@
size_t len = 4096;
if (mSupplicant->sendCommand("SCAN_RESULTS", reply, &len)) {
- LOGW("onScanResultsEvent: Error getting scan results (%s)",
+ ALOGW("onScanResultsEvent: Error getting scan results (%s)",
strerror(errno));
free(reply);
return;
diff --git a/nexus/WifiNetwork.cpp b/nexus/WifiNetwork.cpp
index 92af0cb..346c7c2 100644
--- a/nexus/WifiNetwork.cpp
+++ b/nexus/WifiNetwork.cpp
@@ -77,7 +77,7 @@
if (!strcmp(flags, "[DISABLED]"))
mEnabled = false;
else
- LOGW("Unsupported flags '%s'", flags);
+ ALOGW("Unsupported flags '%s'", flags);
}
free(tmp);
@@ -526,13 +526,13 @@
else if (!strcasecmp(v_token, "IEEE8021X"))
*mask |= KeyManagementMask::IEEE8021X;
else {
- LOGW("Invalid KeyManagementMask value '%s'", v_token);
+ ALOGW("Invalid KeyManagementMask value '%s'", v_token);
errno = EINVAL;
free(v_tmp);
return -1;
}
} else {
- LOGW("KeyManagementMask value '%s' when NONE", v_token);
+ ALOGW("KeyManagementMask value '%s' when NONE", v_token);
errno = EINVAL;
free(v_tmp);
return -1;
@@ -556,7 +556,7 @@
else if (!strcasecmp(v_token, "RSN"))
*mask |= SecurityProtocolMask::RSN;
else {
- LOGW("Invalid ProtocolsMask value '%s'", v_token);
+ ALOGW("Invalid ProtocolsMask value '%s'", v_token);
errno = EINVAL;
free(v_tmp);
return -1;
@@ -587,7 +587,7 @@
else if (!strcasecmp(v_token, "LEAP"))
*mask |= AuthenticationAlgorithmMask::LEAP;
else {
- LOGW("Invalid AuthAlgorithmsMask value '%s'", v_token);
+ ALOGW("Invalid AuthAlgorithmsMask value '%s'", v_token);
errno = EINVAL;
free(v_tmp);
return -1;
@@ -616,13 +616,13 @@
else if (!strcasecmp(v_token, "CCMP"))
*mask |= PairwiseCiphersMask::CCMP;
else {
- LOGW("PairwiseCiphersMask value '%s' when NONE", v_token);
+ ALOGW("PairwiseCiphersMask value '%s' when NONE", v_token);
errno = EINVAL;
free(v_tmp);
return -1;
}
} else {
- LOGW("Invalid PairwiseCiphersMask value '%s'", v_token);
+ ALOGW("Invalid PairwiseCiphersMask value '%s'", v_token);
errno = EINVAL;
free(v_tmp);
return -1;
@@ -651,7 +651,7 @@
else if (!strcasecmp(v_token, "CCMP"))
*mask |= GroupCiphersMask::CCMP;
else {
- LOGW("Invalid GroupCiphersMask value '%s'", v_token);
+ ALOGW("Invalid GroupCiphersMask value '%s'", v_token);
errno = EINVAL;
free(v_tmp);
return -1;
diff --git a/nexus/WifiScanner.cpp b/nexus/WifiScanner.cpp
index 856e85f..9854ddc 100644
--- a/nexus/WifiScanner.cpp
+++ b/nexus/WifiScanner.cpp
@@ -88,7 +88,7 @@
FD_SET(mCtrlPipe[0], &read_fds);
if (mSuppl->triggerScan(mActive)) {
- LOGW("Error triggering scan (%s)", strerror(errno));
+ ALOGW("Error triggering scan (%s)", strerror(errno));
}
if ((rc = select(mCtrlPipe[0] + 1, &read_fds, NULL, NULL, &to)) < 0) {