Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGE
Bug: 5449033
Change-Id: I9244d927f14c750cd359ebffb1fc1c355a755d5a
diff --git a/nexus/DhcpClient.cpp b/nexus/DhcpClient.cpp
index 713059d..71c2d8a 100644
--- a/nexus/DhcpClient.cpp
+++ b/nexus/DhcpClient.cpp
@@ -53,7 +53,7 @@
}
int DhcpClient::start(Controller *c) {
- LOGD("Starting DHCP service (arp probe = %d)", mDoArpProbe);
+ ALOGD("Starting DHCP service (arp probe = %d)", mDoArpProbe);
char svc[PROPERTY_VALUE_MAX];
snprintf(svc,
sizeof(svc),
diff --git a/nexus/NetworkManager.cpp b/nexus/NetworkManager.cpp
index e0df409..8ea36f8 100644
--- a/nexus/NetworkManager.cpp
+++ b/nexus/NetworkManager.cpp
@@ -107,7 +107,7 @@
}
void NetworkManager::onInterfaceConnected(Controller *c) {
- LOGD("Controller %s interface %s connected", c->getName(), c->getBoundInterface());
+ ALOGD("Controller %s interface %s connected", c->getName(), c->getBoundInterface());
if (mDhcp->start(c)) {
LOGE("Failed to start DHCP (%s)", strerror(errno));
@@ -116,20 +116,20 @@
}
void NetworkManager::onInterfaceDisconnected(Controller *c) {
- LOGD("Controller %s interface %s disconnected", c->getName(),
+ ALOGD("Controller %s interface %s disconnected", c->getName(),
c->getBoundInterface());
mDhcp->stop();
}
void NetworkManager::onControllerSuspending(Controller *c) {
- LOGD("Controller %s interface %s suspending", c->getName(),
+ ALOGD("Controller %s interface %s suspending", c->getName(),
c->getBoundInterface());
mDhcp->stop();
}
void NetworkManager::onControllerResumed(Controller *c) {
- LOGD("Controller %s interface %s resumed", c->getName(),
+ ALOGD("Controller %s interface %s resumed", c->getName(),
c->getBoundInterface());
}
@@ -137,7 +137,7 @@
char tmp[255];
char tmp2[255];
- LOGD("onDhcpStateChanged(%s -> %s)",
+ ALOGD("onDhcpStateChanged(%s -> %s)",
DhcpState::toString(mLastDhcpState, tmp, sizeof(tmp)),
DhcpState::toString(state, tmp2, sizeof(tmp2)));
@@ -169,7 +169,7 @@
void NetworkManager::onDhcpEvent(Controller *c, int evt) {
char tmp[64];
- LOGD("onDhcpEvent(%s)", DhcpEvent::toString(evt, tmp, sizeof(tmp)));
+ ALOGD("onDhcpEvent(%s)", DhcpEvent::toString(evt, tmp, sizeof(tmp)));
}
void NetworkManager::onDhcpLeaseUpdated(Controller *c, struct in_addr *addr,
diff --git a/nexus/PropertyManager.cpp b/nexus/PropertyManager.cpp
index 704b223..dbfb832 100644
--- a/nexus/PropertyManager.cpp
+++ b/nexus/PropertyManager.cpp
@@ -66,10 +66,10 @@
int PropertyManager::attachProperty(const char *ns_name, Property *p) {
PropertyNamespace *ns;
- LOGD("Attaching property %s to namespace %s", p->getName(), ns_name);
+ ALOGD("Attaching property %s to namespace %s", p->getName(), ns_name);
pthread_mutex_lock(&mLock);
if (!(ns = lookupNamespace_UNLOCKED(ns_name))) {
- LOGD("Creating namespace %s", ns_name);
+ ALOGD("Creating namespace %s", ns_name);
ns = new PropertyNamespace(ns_name);
mNamespaces->push_back(ns);
}
@@ -90,7 +90,7 @@
int PropertyManager::detachProperty(const char *ns_name, Property *p) {
PropertyNamespace *ns;
- LOGD("Detaching property %s from namespace %s", p->getName(), ns_name);
+ ALOGD("Detaching property %s from namespace %s", p->getName(), ns_name);
pthread_mutex_lock(&mLock);
if (!(ns = lookupNamespace_UNLOCKED(ns_name))) {
pthread_mutex_unlock(&mLock);
@@ -193,7 +193,7 @@
int PropertyManager::set(const char *name, const char *value) {
- LOGD("set %s = '%s'", name, value);
+ ALOGD("set %s = '%s'", name, value);
pthread_mutex_lock(&mLock);
PropertyNamespaceCollection::iterator ns_it;
for (ns_it = mNamespaces->begin(); ns_it != mNamespaces->end(); ++ns_it) {
diff --git a/nexus/Supplicant.cpp b/nexus/Supplicant.cpp
index 6aa36e8..9fa3b54 100644
--- a/nexus/Supplicant.cpp
+++ b/nexus/Supplicant.cpp
@@ -120,7 +120,7 @@
return -1;
}
-// LOGD("sendCommand(): -> '%s'", cmd);
+// ALOGD("sendCommand(): -> '%s'", cmd);
int rc;
memset(reply, 0, *reply_len);
@@ -133,7 +133,7 @@
return -1;
}
- // LOGD("sendCommand(): <- '%s'", reply);
+ // ALOGD("sendCommand(): <- '%s'", reply);
return 0;
}
SupplicantStatus *Supplicant::getStatus() {
@@ -233,7 +233,7 @@
}
- LOGD("Networks added %d, refreshed %d, removed %d\n",
+ ALOGD("Networks added %d, refreshed %d, removed %d\n",
num_added, num_refreshed, num_removed);
pthread_mutex_unlock(&mNetworksLock);
@@ -350,7 +350,7 @@
char reply[64];
size_t len = sizeof(reply);
- LOGD("stopDriver()");
+ ALOGD("stopDriver()");
if (sendCommand("DRIVER STOP", reply, &len)) {
LOGW("Failed to stop driver (%s)", strerror(errno));
@@ -363,7 +363,7 @@
char reply[64];
size_t len = sizeof(reply);
- LOGD("startDriver()");
+ ALOGD("startDriver()");
if (sendCommand("DRIVER START", reply, &len)) {
LOGW("Failed to start driver (%s)", strerror(errno));
return -1;
@@ -496,7 +496,7 @@
char reply[255];
size_t len = sizeof(reply) -1;
- LOGD("netid %d, var '%s' = '%s'", networkId, var, val);
+ ALOGD("netid %d, var '%s' = '%s'", networkId, var, val);
char *tmp;
asprintf(&tmp, "SET_NETWORK %d %s %s", networkId, var, val);
if (sendCommand(tmp, reply, &len)) {
@@ -621,7 +621,7 @@
int Supplicant::setApScanMode(int mode) {
char req[64];
-// LOGD("setApScanMode(%d)", mode);
+// ALOGD("setApScanMode(%d)", mode);
sprintf(req, "AP_SCAN %d", mode);
char reply[16];
diff --git a/nexus/SupplicantListener.cpp b/nexus/SupplicantListener.cpp
index b91fc02..092f2d9 100644
--- a/nexus/SupplicantListener.cpp
+++ b/nexus/SupplicantListener.cpp
@@ -54,7 +54,7 @@
buf[nread] = '\0';
if (!rc && !nread) {
- LOGD("Received EOF on supplicant socket\n");
+ ALOGD("Received EOF on supplicant socket\n");
strncpy(buf, WPA_EVENT_TERMINATING " - signal 0 received", buflen-1);
buf[buflen-1] = '\0';
return false;
diff --git a/nexus/SupplicantStatus.cpp b/nexus/SupplicantStatus.cpp
index b3c560a..7868264 100644
--- a/nexus/SupplicantStatus.cpp
+++ b/nexus/SupplicantStatus.cpp
@@ -83,7 +83,7 @@
else
LOGE("Unknown supplicant state '%s'", value);
} else
- LOGD("Ignoring unsupported status token '%s'", token);
+ ALOGD("Ignoring unsupported status token '%s'", token);
}
return new SupplicantStatus(state, id, bssid, ssid);
diff --git a/nexus/TiwlanEventListener.cpp b/nexus/TiwlanEventListener.cpp
index 15e6930..16c63c1 100644
--- a/nexus/TiwlanEventListener.cpp
+++ b/nexus/TiwlanEventListener.cpp
@@ -45,13 +45,13 @@
if (data->event_type == IPC_EVENT_LINK_SPEED) {
uint32_t *spd = (uint32_t *) data->buffer;
*spd /= 2;
-// LOGD("Link speed = %u MB/s", *spd);
+// ALOGD("Link speed = %u MB/s", *spd);
} else if (data->event_type == IPC_EVENT_LOW_SNR) {
LOGW("Low signal/noise ratio");
} else if (data->event_type == IPC_EVENT_LOW_RSSI) {
LOGW("Low RSSI");
} else {
-// LOGD("Dropping unhandled driver event %d", data->event_type);
+// ALOGD("Dropping unhandled driver event %d", data->event_type);
}
// TODO: Tell WifiController about the event
diff --git a/nexus/TiwlanWifiController.cpp b/nexus/TiwlanWifiController.cpp
index 016c790..384f136 100644
--- a/nexus/TiwlanWifiController.cpp
+++ b/nexus/TiwlanWifiController.cpp
@@ -75,7 +75,7 @@
while (count-- > 0) {
if (property_get(DRIVER_PROP_NAME, driver_status, NULL)) {
if (!strcmp(driver_status, "ok")) {
- LOGD("Firmware loaded OK");
+ ALOGD("Firmware loaded OK");
if (startDriverEventListener()) {
LOGW("Failed to start driver event listener (%s)",
diff --git a/nexus/WifiController.cpp b/nexus/WifiController.cpp
index c218c30..1209d1f 100644
--- a/nexus/WifiController.cpp
+++ b/nexus/WifiController.cpp
@@ -204,26 +204,26 @@
mHandlers->onControllerSuspending(this);
char tmp[80];
- LOGD("Suspending from supplicant state %s",
+ ALOGD("Suspending from supplicant state %s",
SupplicantState::toString(mSupplicantState,
tmp,
sizeof(tmp)));
if (mSupplicantState != SupplicantState::IDLE) {
- LOGD("Forcing Supplicant disconnect");
+ ALOGD("Forcing Supplicant disconnect");
if (mSupplicant->disconnect()) {
LOGW("Error disconnecting (%s)", strerror(errno));
}
}
- LOGD("Stopping Supplicant driver");
+ ALOGD("Stopping Supplicant driver");
if (mSupplicant->stopDriver()) {
LOGE("Error stopping driver (%s)", strerror(errno));
pthread_mutex_unlock(&mLock);
return -1;
}
} else {
- LOGD("Resuming");
+ ALOGD("Resuming");
if (mSupplicant->startDriver()) {
LOGE("Error resuming driver (%s)", strerror(errno));
@@ -241,7 +241,7 @@
mSuspended = suspend;
pthread_mutex_unlock(&mLock);
- LOGD("Suspend / Resume completed");
+ ALOGD("Suspend / Resume completed");
return 0;
}
@@ -426,18 +426,18 @@
}
void WifiController::onAssociatingEvent(SupplicantAssociatingEvent *evt) {
- LOGD("onAssociatingEvent(%s, %s, %d)",
+ ALOGD("onAssociatingEvent(%s, %s, %d)",
(evt->getBssid() ? evt->getBssid() : "n/a"),
(evt->getSsid() ? evt->getSsid() : "n/a"),
evt->getFreq());
}
void WifiController::onAssociatedEvent(SupplicantAssociatedEvent *evt) {
- LOGD("onAssociatedEvent(%s)", evt->getBssid());
+ ALOGD("onAssociatedEvent(%s)", evt->getBssid());
}
void WifiController::onConnectedEvent(SupplicantConnectedEvent *evt) {
- LOGD("onConnectedEvent(%s, %d)", evt->getBssid(), evt->getReassociated());
+ ALOGD("onConnectedEvent(%s, %d)", evt->getBssid(), evt->getReassociated());
SupplicantStatus *ss = mSupplicant->getStatus();
WifiNetwork *wn;
@@ -530,7 +530,7 @@
if (evt->getState() == mSupplicantState)
return;
- LOGD("onStateChangeEvent(%s -> %s)",
+ ALOGD("onStateChangeEvent(%s -> %s)",
SupplicantState::toString(mSupplicantState, tmp, sizeof(tmp)),
SupplicantState::toString(evt->getState(), tmp2, sizeof(tmp2)));
@@ -559,7 +559,7 @@
}
void WifiController::onConnectionTimeoutEvent(SupplicantConnectionTimeoutEvent *evt) {
- LOGD("onConnectionTimeoutEvent(%s)", evt->getBssid());
+ ALOGD("onConnectionTimeoutEvent(%s)", evt->getBssid());
}
void WifiController::onDisconnectedEvent(SupplicantDisconnectedEvent *evt) {
@@ -569,39 +569,39 @@
#if 0
void WifiController::onTerminatingEvent(SupplicantEvent *evt) {
- LOGD("onTerminatingEvent(%s)", evt->getEvent());
+ ALOGD("onTerminatingEvent(%s)", evt->getEvent());
}
void WifiController::onPasswordChangedEvent(SupplicantEvent *evt) {
- LOGD("onPasswordChangedEvent(%s)", evt->getEvent());
+ ALOGD("onPasswordChangedEvent(%s)", evt->getEvent());
}
void WifiController::onEapNotificationEvent(SupplicantEvent *evt) {
- LOGD("onEapNotificationEvent(%s)", evt->getEvent());
+ ALOGD("onEapNotificationEvent(%s)", evt->getEvent());
}
void WifiController::onEapStartedEvent(SupplicantEvent *evt) {
- LOGD("onEapStartedEvent(%s)", evt->getEvent());
+ ALOGD("onEapStartedEvent(%s)", evt->getEvent());
}
void WifiController::onEapMethodEvent(SupplicantEvent *evt) {
- LOGD("onEapMethodEvent(%s)", evt->getEvent());
+ ALOGD("onEapMethodEvent(%s)", evt->getEvent());
}
void WifiController::onEapSuccessEvent(SupplicantEvent *evt) {
- LOGD("onEapSuccessEvent(%s)", evt->getEvent());
+ ALOGD("onEapSuccessEvent(%s)", evt->getEvent());
}
void WifiController::onEapFailureEvent(SupplicantEvent *evt) {
- LOGD("onEapFailureEvent(%s)", evt->getEvent());
+ ALOGD("onEapFailureEvent(%s)", evt->getEvent());
}
void WifiController::onLinkSpeedEvent(SupplicantEvent *evt) {
- LOGD("onLinkSpeedEvent(%s)", evt->getEvent());
+ ALOGD("onLinkSpeedEvent(%s)", evt->getEvent());
}
void WifiController::onDriverStateEvent(SupplicantEvent *evt) {
- LOGD("onDriverStateEvent(%s)", evt->getEvent());
+ ALOGD("onDriverStateEvent(%s)", evt->getEvent());
}
#endif
diff --git a/nexus/WifiNetwork.cpp b/nexus/WifiNetwork.cpp
index 6a0f684..92af0cb 100644
--- a/nexus/WifiNetwork.cpp
+++ b/nexus/WifiNetwork.cpp
@@ -51,7 +51,7 @@
if (!(flags = strsep(&next, "\t")))
LOGE("Failed to extract flags");
- // LOGD("id '%s', ssid '%s', bssid '%s', flags '%s'", id, ssid, bssid,
+ // ALOGD("id '%s', ssid '%s', bssid '%s', flags '%s'", id, ssid, bssid,
// flags ? flags :"null");
if (id)
@@ -511,7 +511,7 @@
char *v_next = v_tmp;
char *v_token;
-// LOGD("parseKeyManagementMask(%s)", buffer);
+// ALOGD("parseKeyManagementMask(%s)", buffer);
*mask = 0;
while((v_token = strsep(&v_next, " "))) {
@@ -548,7 +548,7 @@
char *v_next = v_tmp;
char *v_token;
-// LOGD("parseProtocolsMask(%s)", buffer);
+// ALOGD("parseProtocolsMask(%s)", buffer);
*mask = 0;
while((v_token = strsep(&v_next, " "))) {
if (!strcasecmp(v_token, "WPA"))
@@ -573,7 +573,7 @@
char *v_next = v_tmp;
char *v_token;
-// LOGD("parseAuthAlgorithmsMask(%s)", buffer);
+// ALOGD("parseAuthAlgorithmsMask(%s)", buffer);
*mask = 0;
if (buffer[0] == '\0')
@@ -603,7 +603,7 @@
char *v_next = v_tmp;
char *v_token;
-// LOGD("parsePairwiseCiphersMask(%s)", buffer);
+// ALOGD("parsePairwiseCiphersMask(%s)", buffer);
*mask = 0;
while((v_token = strsep(&v_next, " "))) {
@@ -638,7 +638,7 @@
char *v_next = v_tmp;
char *v_token;
-// LOGD("parseGroupCiphersMask(%s)", buffer);
+// ALOGD("parseGroupCiphersMask(%s)", buffer);
*mask = 0;
while((v_token = strsep(&v_next, " "))) {
diff --git a/nexus/WifiScanner.cpp b/nexus/WifiScanner.cpp
index bdfa497..856e85f 100644
--- a/nexus/WifiScanner.cpp
+++ b/nexus/WifiScanner.cpp
@@ -74,7 +74,7 @@
}
void WifiScanner::run() {
- LOGD("Starting wifi scanner (active = %d)", mActive);
+ ALOGD("Starting wifi scanner (active = %d)", mActive);
while(1) {
fd_set read_fds;
@@ -99,5 +99,5 @@
} else if (FD_ISSET(mCtrlPipe[0], &read_fds))
break;
} // while
- LOGD("Stopping wifi scanner");
+ ALOGD("Stopping wifi scanner");
}
diff --git a/nexus/WifiStatusPoller.cpp b/nexus/WifiStatusPoller.cpp
index cf71733..e938fd0 100644
--- a/nexus/WifiStatusPoller.cpp
+++ b/nexus/WifiStatusPoller.cpp
@@ -68,10 +68,10 @@
WifiStatusPoller *me = reinterpret_cast<WifiStatusPoller *>(obj);
me->mStarted = true;
- LOGD("Starting");
+ ALOGD("Starting");
me->run();
me->mStarted = false;
- LOGD("Stopping");
+ ALOGD("Stopping");
pthread_exit(NULL);
return NULL;
}