Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGE

See https://android-git.corp.google.com/g/156016

Bug: 5449033
Change-Id: I9dfdc3f00a5f4f5b6ef4c75280ce2594ab018577
This commit is contained in:
Steve Block 2011-12-20 16:25:34 +00:00
parent da52930b89
commit b381b932ac
4 changed files with 12 additions and 12 deletions

View file

@ -38,7 +38,7 @@ static const char *sA2dpWakeLock = "A2dpOutputStream";
// AudioHardwareInterface* hw = 0;
//
// hw = AudioHardwareInterface::create();
// LOGD("new A2dpAudioInterface(hw: %p)", hw);
// ALOGD("new A2dpAudioInterface(hw: %p)", hw);
// hw = new A2dpAudioInterface(hw);
// return hw;
//}
@ -239,7 +239,7 @@ status_t A2dpAudioInterface::A2dpAudioStreamOut::set(
uint32_t lChannels = pChannels ? *pChannels : 0;
uint32_t lRate = pRate ? *pRate : 0;
LOGD("A2dpAudioStreamOut::set %x, %d, %d, %d\n", device, lFormat, lChannels, lRate);
ALOGD("A2dpAudioStreamOut::set %x, %d, %d, %d\n", device, lFormat, lChannels, lRate);
// fix up defaults
if (lFormat == 0) lFormat = format();
@ -448,7 +448,7 @@ status_t A2dpAudioInterface::A2dpAudioStreamOut::setAddress(const char* address)
status_t A2dpAudioInterface::A2dpAudioStreamOut::setBluetoothEnabled(bool enabled)
{
LOGD("setBluetoothEnabled %d", enabled);
ALOGD("setBluetoothEnabled %d", enabled);
Mutex::Autolock lock(mLock);

View file

@ -83,7 +83,7 @@ AudioHardwareBase::AudioHardwareBase()
status_t AudioHardwareBase::setMode(int mode)
{
#if LOG_ROUTING_CALLS
LOGD("setMode(%s)", displayMode(mode));
ALOGD("setMode(%s)", displayMode(mode));
#endif
if ((mode < 0) || (mode >= AudioSystem::NUM_MODES))
return BAD_VALUE;

View file

@ -31,7 +31,7 @@
#define QEMU_DEBUG 0
#if QEMU_DEBUG
# define D(...) LOGD(__VA_ARGS__)
# define D(...) ALOGD(__VA_ARGS__)
#else
# define D(...) ((void)0)
#endif

View file

@ -152,7 +152,7 @@ static int rmmod(const char *modname)
}
if (ret != 0)
LOGD("Unable to unload driver module \"%s\": %s\n",
ALOGD("Unable to unload driver module \"%s\": %s\n",
modname, strerror(errno));
return ret;
}
@ -673,7 +673,7 @@ int wifi_send_command(int index, const char *cmd, char *reply, size_t *reply_len
}
ret = wpa_ctrl_request(ctrl_conn[index], cmd, strlen(cmd), reply, reply_len, NULL);
if (ret == -2) {
LOGD("'%s' command timed out.\n", cmd);
ALOGD("'%s' command timed out.\n", cmd);
/* unblocks the monitor receive socket for termination */
write(exit_sockets[index][0], "T", 1);
return -2;
@ -705,7 +705,7 @@ int wifi_ctrl_recv(int index, char *reply, size_t *reply_len)
if (rfds[0].revents & POLLIN) {
return wpa_ctrl_recv(monitor_conn[index], reply, reply_len);
} else {
LOGD("Received on exit socket, terminate");
ALOGD("Received on exit socket, terminate");
return -1;
}
return 0;
@ -721,7 +721,7 @@ int wifi_wait_on_socket(int index, char *buf, size_t buflen)
struct timeval *tptr;
if (monitor_conn[index] == NULL) {
LOGD("Connection closed\n");
ALOGD("Connection closed\n");
strncpy(buf, WPA_EVENT_TERMINATING " - connection closed", buflen-1);
buf[buflen-1] = '\0';
return strlen(buf);
@ -729,17 +729,17 @@ int wifi_wait_on_socket(int index, char *buf, size_t buflen)
result = wifi_ctrl_recv(index, buf, &nread);
if (result < 0) {
LOGD("wifi_ctrl_recv failed: %s\n", strerror(errno));
ALOGD("wifi_ctrl_recv failed: %s\n", strerror(errno));
strncpy(buf, WPA_EVENT_TERMINATING " - recv error", buflen-1);
buf[buflen-1] = '\0';
return strlen(buf);
}
buf[nread] = '\0';
/* LOGD("wait_for_event: result=%d nread=%d string=\"%s\"\n", result, nread, buf); */
/* ALOGD("wait_for_event: result=%d nread=%d string=\"%s\"\n", result, nread, buf); */
/* Check for EOF on the socket */
if (result == 0 && nread == 0) {
/* Fabricate an event to pass up */
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 strlen(buf);