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

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

Bug: 5449033
Change-Id: Iceae7f67d24f5b47c095f0c148af917547eee32d

11 files changed, 75 insertions, 75 deletions

diff --git a/libaudio-qdsp5v2/AudioHardware.cpp b/libaudio-qdsp5v2/AudioHardware.cpp
index c8d67b4..a4da511 100644
--- a/libaudio-qdsp5v2/AudioHardware.cpp
+++ b/libaudio-qdsp5v2/AudioHardware.cpp
@@ -214,7 +214,7 @@ AudioHardware::AudioStreamOutQ5V2::~AudioStreamOutQ5V2()
 
 ssize_t AudioHardware::AudioStreamOutQ5V2::write(const void* buffer, size_t bytes)
 {
-    // LOGD("AudioStreamOutQ5V2::write(%p, %u)", buffer, bytes);
+    // ALOGD("AudioStreamOutQ5V2::write(%p, %u)", buffer, bytes);
     status_t status = NO_INIT;
     size_t count = bytes;
     const uint8_t* p = static_cast<const uint8_t*>(buffer);
diff --git a/libaudio-qsd8k/AudioHardware.cpp b/libaudio-qsd8k/AudioHardware.cpp
index 0337982..b7887ec 100644
--- a/libaudio-qsd8k/AudioHardware.cpp
+++ b/libaudio-qsd8k/AudioHardware.cpp
@@ -119,7 +119,7 @@ AudioHardware::AudioHardware() :
 
     acoustic =:: dlopen("/system/lib/libhtc_acoustic.so", RTLD_NOW);
     if (acoustic == NULL ) {
-        LOGD("Could not open libhtc_acoustic.so");
+        ALOGD("Could not open libhtc_acoustic.so");
         /* this is not really an error on non-htc devices... */
         mNumBTEndpoints = 0;
         mInit = true;
@@ -133,26 +133,26 @@ AudioHardware::AudioHardware() :
 
     set_tpa2018d1_parameters = (int (*)(void))::dlsym(acoustic, "set_tpa2018d1_parameters");
     if ((*set_tpa2018d1_parameters) == 0) {
-        LOGD("set_tpa2018d1_parameters() not present");
+        ALOGD("set_tpa2018d1_parameters() not present");
         support_tpa2018d1 = false;
     }
 
     int rc = set_acoustic_parameters();
     if (rc < 0) {
-        LOGD("Could not set acoustic parameters to share memory: %d", rc);
+        ALOGD("Could not set acoustic parameters to share memory: %d", rc);
     }
 
     if (support_tpa2018d1) {
        rc = set_tpa2018d1_parameters();
        if (rc < 0) {
            support_tpa2018d1 = false;
-           LOGD("speaker amplifier tpa2018 is not supported\n");
+           ALOGD("speaker amplifier tpa2018 is not supported\n");
        }
     }
 
     snd_get_num = (int (*)(void))::dlsym(acoustic, "snd_get_num");
     if ((*snd_get_num) == 0 ) {
-        LOGD("Could not open snd_get_num()");
+        ALOGD("Could not open snd_get_num()");
     }
 
     mNumBTEndpoints = snd_get_num();
@@ -344,7 +344,7 @@ static status_t set_mic_mute(bool _mute)
         LOGE("Cannot open msm_audio_ctl device\n");
         return -1;
     }
-    LOGD("Setting mic mute to %d\n", mute);
+    ALOGD("Setting mic mute to %d\n", mute);
     if (ioctl(fd, AUDIO_SET_MUTE, &mute)) {
         LOGE("Cannot set mic mute on current device\n");
         close(fd);
@@ -397,10 +397,10 @@ status_t AudioHardware::setParameters(const String8& keyValuePairs)
         if (param.get(key, value) == NO_ERROR) {
             if (value == HAC_VALUE_ON) {
                 mHACSetting = true;
-                LOGD("Enable HAC");
+                ALOGD("Enable HAC");
             } else {
                 mHACSetting = false;
-                LOGD("Disable HAC");
+                ALOGD("Disable HAC");
             }
         }
     }
@@ -411,7 +411,7 @@ status_t AudioHardware::setParameters(const String8& keyValuePairs)
             mBluetoothNrec = true;
         } else {
             mBluetoothNrec = false;
-            LOGD("Turning noise reduction and echo cancellation off for BT "
+            ALOGD("Turning noise reduction and echo cancellation off for BT "
                  "headset");
         }
     }
@@ -423,12 +423,12 @@ status_t AudioHardware::setParameters(const String8& keyValuePairs)
             if (!strcasecmp(value.string(), mBTEndpoints[i].name)) {
                 mBluetoothIdTx = mBTEndpoints[i].tx;
                 mBluetoothIdRx = mBTEndpoints[i].rx;
-                LOGD("Using custom acoustic parameters for %s", value.string());
+                ALOGD("Using custom acoustic parameters for %s", value.string());
                 break;
             }
         }
         if (mBluetoothIdTx == 0) {
-            LOGD("Using default acoustic parameters "
+            ALOGD("Using default acoustic parameters "
                  "(%s not in acoustic database)", value.string());
         }
         doRouting();
@@ -601,7 +601,7 @@ static status_t set_volume_rpc(uint32_t volume)
         return -1;
     }
     volume *= 20; //percentage
-    LOGD("Setting in-call volume to %d\n", volume);
+    ALOGD("Setting in-call volume to %d\n", volume);
     if (ioctl(fd, AUDIO_SET_VOLUME, &volume)) {
         LOGW("Cannot set volume on current device\n");
     }
@@ -623,7 +623,7 @@ status_t AudioHardware::setVoiceVolume(float v)
 
     Mutex::Autolock lock(mLock);
     if (mHACSetting && hac_enable && mCurSndDevice == (int) SND_DEVICE_HANDSET) {
-        LOGD("HAC enable: Setting in-call volume to maximum.\n");
+        ALOGD("HAC enable: Setting in-call volume to maximum.\n");
         set_volume_rpc(VOICE_VOLUME_MAX);
     } else {
         LOGI("voice volume %d (range is 0 to %d)", vol, VOICE_VOLUME_MAX);
@@ -652,68 +652,68 @@ static status_t do_route_audio_dev_ctrl(uint32_t device, bool inCall, uint32_t r
         goto Incall;
 
     // hack -- kernel needs to put these in include file
-    LOGD("Switching audio device to ");
+    ALOGD("Switching audio device to ");
     if (device == SND_DEVICE_HANDSET) {
            out_device = HANDSET_SPKR;
            mic_device = HANDSET_MIC;
-           LOGD("Handset");
+           ALOGD("Handset");
     } else if ((device  == SND_DEVICE_BT) || (device == SND_DEVICE_BT_EC_OFF)) {
            out_device = BT_SCO_SPKR;
            mic_device = BT_SCO_MIC;
-           LOGD("BT Headset");
+           ALOGD("BT Headset");
     } else if (device == SND_DEVICE_SPEAKER ||
                device == SND_DEVICE_SPEAKER_BACK_MIC) {
            out_device = SPKR_PHONE_MONO;
            mic_device = SPKR_PHONE_MIC;
-           LOGD("Speakerphone");
+           ALOGD("Speakerphone");
     } else if (device == SND_DEVICE_HEADSET) {
            out_device = HEADSET_SPKR_STEREO;
            mic_device = HEADSET_MIC;
-           LOGD("Stereo Headset");
+           ALOGD("Stereo Headset");
     } else if (device == SND_DEVICE_HEADSET_AND_SPEAKER) {
            out_device = SPKR_PHONE_HEADSET_STEREO;
            mic_device = HEADSET_MIC;
-           LOGD("Stereo Headset + Speaker");
+           ALOGD("Stereo Headset + Speaker");
     } else if (device == SND_DEVICE_HEADSET_AND_SPEAKER_BACK_MIC) {
            out_device = SPKR_PHONE_HEADSET_STEREO;
            mic_device = SPKR_PHONE_MIC;
-           LOGD("Stereo Headset + Speaker and back mic");
+           ALOGD("Stereo Headset + Speaker and back mic");
     } else if (device == SND_DEVICE_NO_MIC_HEADSET) {
            out_device = HEADSET_SPKR_STEREO;
            mic_device = HANDSET_MIC;
-           LOGD("No microphone Wired Headset");
+           ALOGD("No microphone Wired Headset");
     } else if (device == SND_DEVICE_NO_MIC_HEADSET_BACK_MIC) {
            out_device = HEADSET_SPKR_STEREO;
            mic_device = SPKR_PHONE_MIC;
-           LOGD("No microphone Wired Headset and back mic");
+           ALOGD("No microphone Wired Headset and back mic");
     } else if (device == SND_DEVICE_HANDSET_BACK_MIC) {
            out_device = HANDSET_SPKR;
            mic_device = SPKR_PHONE_MIC;
-           LOGD("Handset and back mic");
+           ALOGD("Handset and back mic");
     } else if (device == SND_DEVICE_FM_HEADSET) {
            out_device = FM_HEADSET;
            mic_device = HEADSET_MIC;
-           LOGD("Stereo FM headset");
+           ALOGD("Stereo FM headset");
     } else if (device == SND_DEVICE_FM_SPEAKER) {
            out_device = FM_SPKR;
            mic_device = HEADSET_MIC;
-           LOGD("Stereo FM speaker");
+           ALOGD("Stereo FM speaker");
     } else if (device == SND_DEVICE_CARKIT) {
            out_device = BT_SCO_SPKR;
            mic_device = BT_SCO_MIC;
-           LOGD("Carkit");
+           ALOGD("Carkit");
     } else if (device == SND_DEVICE_TTY_FULL) {
         out_device = TTY_HEADSET_SPKR;
         mic_device = TTY_HEADSET_MIC;
-        LOGD("TTY FULL headset");
+        ALOGD("TTY FULL headset");
     } else if (device == SND_DEVICE_TTY_VCO) {
         out_device = TTY_HEADSET_SPKR;
         mic_device = SPKR_PHONE_MIC;
-        LOGD("TTY VCO headset");
+        ALOGD("TTY VCO headset");
     } else if (device == SND_DEVICE_TTY_HCO) {
         out_device = SPKR_PHONE_MONO;
         mic_device = TTY_HEADSET_MIC;
-        LOGD("TTY HCO headset");
+        ALOGD("TTY HCO headset");
     } else {
         LOGE("unknown device %d", device);
         return -1;
@@ -728,12 +728,12 @@ static status_t do_route_audio_dev_ctrl(uint32_t device, bool inCall, uint32_t r
                 LOGE("Cannot open msm_htc_fm device");
                 return -1;
             }
-            LOGD("Opened msm_htc_fm for FM radio");
+            ALOGD("Opened msm_htc_fm for FM radio");
         }
     } else if (fd_fm_device >= 0) {
         close(fd_fm_device);
         fd_fm_device = -1;
-        LOGD("Closed msm_htc_fm after FM radio");
+        ALOGD("Closed msm_htc_fm after FM radio");
     }
 #endif
 
@@ -776,7 +776,7 @@ Incall:
             close(fd);
             return -1;
         }
-        LOGD("Voice Started!!");
+        ALOGD("Voice Started!!");
         voice_started = 1;
     }
     else if (inCall == false && voice_started) {
@@ -793,7 +793,7 @@ Incall:
                close(fd);
                return -1;
         }
-        LOGD("Voice Stopped!!");
+        ALOGD("Voice Stopped!!");
         voice_started = 0;
     }
 
@@ -826,7 +826,7 @@ status_t AudioHardware::doAudioRouteOrMute(uint32_t device)
             /* use default BT entry defined in AudioBTID.csv */
             rx_acdb_id = mBTEndpoints[0].rx;
             tx_acdb_id = mBTEndpoints[0].tx;
-            LOGD("Update ACDB ID to default BT setting\n");
+            ALOGD("Update ACDB ID to default BT setting\n");
         }
     }  else if (device == (int) SND_DEVICE_CARKIT
                 || device == (int) SND_DEVICE_BT_EC_OFF) {
@@ -837,12 +837,12 @@ status_t AudioHardware::doAudioRouteOrMute(uint32_t device)
             /* use default carkit entry defined in AudioBTID.csv */
             rx_acdb_id = mBTEndpoints[1].rx;
             tx_acdb_id = mBTEndpoints[1].tx;
-            LOGD("Update ACDB ID to default carkit setting");
+            ALOGD("Update ACDB ID to default carkit setting");
         }
     } else if (mMode == AudioSystem::MODE_IN_CALL
                && hac_enable && mHACSetting &&
                device == (int) SND_DEVICE_HANDSET) {
-        LOGD("Update acdb id to hac profile.");
+        ALOGD("Update acdb id to hac profile.");
         rx_acdb_id = ACDB_ID_HAC_HANDSET_SPKR;
         tx_acdb_id = ACDB_ID_HAC_HANDSET_MIC;
     } else {
@@ -925,7 +925,7 @@ status_t AudioHardware::doA1026_init(void)
         LOGE("Fail to open %s\n", fn);
         goto ld_img_error;
     } else {
-        LOGD("open %s success\n", fn);
+        ALOGD("open %s success\n", fn);
     }
 
     rc = fstat(fw_fd, &fw_stat);
@@ -936,7 +936,7 @@ status_t AudioHardware::doA1026_init(void)
 
     remaining = (int)fw_stat.st_size;
 
-    LOGD("Firmware %s size %d\n", fn, remaining);
+    ALOGD("Firmware %s size %d\n", fn, remaining);
 
     if (remaining > sizeof(local_vpimg_buf)) {
         LOGE("File %s size %d exceeds internal limit %d\n",
@@ -965,11 +965,11 @@ status_t AudioHardware::doA1026_init(void)
 
     fwimg.buf = local_vpimg_buf;
     fwimg.img_size = (int)(fw_stat.st_size - remaining);
-    LOGD("Total %d bytes put to user space buffer.\n", fwimg.img_size);
+    ALOGD("Total %d bytes put to user space buffer.\n", fwimg.img_size);
 
     rc = ioctl(fd_a1026, A1026_BOOTUP_INIT, &fwimg);
     if (!rc) {
-        LOGD("audience_a1026 init OK\n");
+        ALOGD("audience_a1026 init OK\n");
         mA1026Init = 1;
     } else
         LOGE("audience_a1026 init failed\n");
@@ -994,7 +994,7 @@ uint32_t AudioHardware::getACDB(int mode, int device)
     uint32_t acdb_id = 0;
     int batt_temp = 0;
     if (mMode == AudioSystem::MODE_IN_CALL) {
-        LOGD("skip update ACDB due to in-call");
+        ALOGD("skip update ACDB due to in-call");
         return 0;
     }
 
@@ -1011,11 +1011,11 @@ uint32_t AudioHardware::getACDB(int mode, int device)
             case SND_DEVICE_SPEAKER_BACK_MIC:
                 acdb_id = ACDB_ID_SPKR_PLAYBACK;
                 if(alt_enable) {
-                    LOGD("Enable ALT for speaker\n");
+                    ALOGD("Enable ALT for speaker\n");
                     if (get_batt_temp(&batt_temp) == NO_ERROR) {
                         if (batt_temp < 50)
                             acdb_id = ACDB_ID_ALT_SPKR_PLAYBACK;
-                        LOGD("ALT batt temp = %d\n", batt_temp);
+                        ALOGD("ALT batt temp = %d\n", batt_temp);
                     }
                 }
                 break;
@@ -1097,7 +1097,7 @@ status_t AudioHardware::do_tpa2018_control(int mode)
         if (rc < 0) {
             LOGE("ioctl TPA2018_SET_MODE failed: %s", strerror(errno));
         } else
-            LOGD("Update TPA2018_SET_MODE to mode %d success", mode);
+            ALOGD("Update TPA2018_SET_MODE to mode %d success", mode);
 
         close(fd);
     }
@@ -1449,7 +1449,7 @@ status_t AudioHardware::doRouting()
         mCurSndDevice = sndDevice;
         if (mMode == AudioSystem::MODE_IN_CALL) {
             if (mHACSetting && hac_enable && mCurSndDevice == (int) SND_DEVICE_HANDSET) {
-                LOGD("HAC enable: Setting in-call volume to maximum.\n");
+                ALOGD("HAC enable: Setting in-call volume to maximum.\n");
                 set_volume_rpc(VOICE_VOLUME_MAX);
             } else {
                 set_volume_rpc(mVoiceVolume);
@@ -1582,7 +1582,7 @@ AudioHardware::AudioStreamOutMSM72xx::~AudioStreamOutMSM72xx()
 
 ssize_t AudioHardware::AudioStreamOutMSM72xx::write(const void* buffer, size_t bytes)
 {
-    // LOGD("AudioStreamOutMSM72xx::write(%p, %u)", buffer, bytes);
+    // ALOGD("AudioStreamOutMSM72xx::write(%p, %u)", buffer, bytes);
     status_t status = NO_INIT;
     size_t count = bytes;
     const uint8_t* p = static_cast<const uint8_t*>(buffer);
@@ -1656,7 +1656,7 @@ ssize_t AudioHardware::AudioStreamOutMSM72xx::write(const void* buffer, size_t b
                 goto Error;
             }
             mRetryCount++;
-            LOGD("EAGAIN - retry");
+            ALOGD("EAGAIN - retry");
         }
     }
 
@@ -1674,7 +1674,7 @@ Error:
 status_t AudioHardware::AudioStreamOutMSM72xx::standby()
 {
     if (!mStandby) {
-        LOGD("AudioHardware pcm playback is going to standby.");
+        ALOGD("AudioHardware pcm playback is going to standby.");
         if (mFd >= 0) {
             ::close(mFd);
             mFd = -1;
@@ -1895,7 +1895,7 @@ ssize_t AudioHardware::AudioStreamInMSM72xx::read( void* buffer, ssize_t bytes)
                 goto Error;
             }
             mRetryCount++;
-            LOGD("EAGAIN - retrying");
+            ALOGD("EAGAIN - retrying");
         }
     }
     return bytes;
@@ -1912,7 +1912,7 @@ Error:
 status_t AudioHardware::AudioStreamInMSM72xx::standby()
 {
     if (!mStandby) {
-        LOGD("AudioHardware PCM record is going to standby.");
+        ALOGD("AudioHardware PCM record is going to standby.");
         if (mFd >= 0) {
             ::close(mFd);
             mFd = -1;
diff --git a/libaudio/AudioHardware.cpp b/libaudio/AudioHardware.cpp
index 69ff7ce..343a310 100644
--- a/libaudio/AudioHardware.cpp
+++ b/libaudio/AudioHardware.cpp
@@ -97,7 +97,7 @@ AudioHardware::AudioHardware() :
     }
 
     mNumSndEndpoints = snd_get_num();
-    LOGD("mNumSndEndpoints = %d", mNumSndEndpoints);
+    ALOGD("mNumSndEndpoints = %d", mNumSndEndpoints);
     mSndEndpoints = new msm_snd_endpoint[mNumSndEndpoints];
     mInit = true;
     ALOGV("constructed %d SND endpoints)", mNumSndEndpoints);
@@ -114,7 +114,7 @@ AudioHardware::AudioHardware() :
 #define CHECK_FOR(desc) \
         if (!strcmp(ept->name, #desc)) { \
             SND_DEVICE_##desc = ept->id; \
-            LOGD("BT MATCH " #desc); \
+            ALOGD("BT MATCH " #desc); \
         } else
         CHECK_FOR(CURRENT)
         CHECK_FOR(HANDSET)
@@ -363,7 +363,7 @@ static status_t set_volume_rpc(uint32_t device,
 {
     int fd;
 #if LOG_SND_RPC
-    LOGD("rpc_snd_set_volume(%d, %d, %d)\n", device, method, volume);
+    ALOGD("rpc_snd_set_volume(%d, %d, %d)\n", device, method, volume);
 #endif
 
     if (device == -1UL) return NO_ERROR;
@@ -407,7 +407,7 @@ status_t AudioHardware::setVoiceVolume(float v)
     }
 
     int vol = lrint(v * 5.0);
-    LOGD("setVoiceVolume(%f)\n", v);
+    ALOGD("setVoiceVolume(%f)\n", v);
     LOGI("Setting in-call volume to %d (available range is 0 to 5)\n", vol);
 
     Mutex::Autolock lock(mLock);
@@ -440,7 +440,7 @@ static status_t do_route_audio_rpc(uint32_t device,
 
     int fd;
 #if LOG_SND_RPC
-    LOGD("rpc_snd_set_device(%d, %d, %d)\n", device, ear_mute, mic_mute);
+    ALOGD("rpc_snd_set_device(%d, %d, %d)\n", device, ear_mute, mic_mute);
 #endif
 
     fd = open("/dev/msm_snd", O_RDWR);
@@ -702,7 +702,7 @@ AudioHardware::AudioStreamOutMSM72xx::~AudioStreamOutMSM72xx()
 
 ssize_t AudioHardware::AudioStreamOutMSM72xx::write(const void* buffer, size_t bytes)
 {
-    // LOGD("AudioStreamOutMSM72xx::write(%p, %u)", buffer, bytes);
+    // ALOGD("AudioStreamOutMSM72xx::write(%p, %u)", buffer, bytes);
     status_t status = NO_INIT;
     size_t count = bytes;
     const uint8_t* p = static_cast<const uint8_t*>(buffer);
@@ -970,7 +970,7 @@ status_t AudioHardware::AudioStreamInMSM72xx::set(
 
     audpre_index = calculate_audpre_table_index(mSampleRate);
     tx_iir_index = (audpre_index * 2) + (hw->checkOutputStandby() ? 0 : 1);
-    LOGD("audpre_index = %d, tx_iir_index = %d\n", audpre_index, tx_iir_index);
+    ALOGD("audpre_index = %d, tx_iir_index = %d\n", audpre_index, tx_iir_index);
 
     /**
      * If audio-preprocessing failed, we should not block record.
diff --git a/libcopybit/copybit.cpp b/libcopybit/copybit.cpp
index 7130ca7..ae782cd 100644
--- a/libcopybit/copybit.cpp
+++ b/libcopybit/copybit.cpp
@@ -212,7 +212,7 @@ static int msm_copybit(struct copybit_context_t *dev, void const *list)
 #if DEBUG_MDP_ERRORS
         struct mdp_blit_req_list const* l = (struct mdp_blit_req_list const*)list;
         for (int i=0 ; i<l->count ; i++) {
-            LOGD("%d: src={w=%d, h=%d, f=%d, rect={%d,%d,%d,%d}}\n"
+            ALOGD("%d: src={w=%d, h=%d, f=%d, rect={%d,%d,%d,%d}}\n"
                  "    dst={w=%d, h=%d, f=%d, rect={%d,%d,%d,%d}}\n"
                  "    flags=%08lx"
                     ,
diff --git a/libgralloc-qsd8k/framebuffer.cpp b/libgralloc-qsd8k/framebuffer.cpp
index 11b303a..c3be1e8 100644
--- a/libgralloc-qsd8k/framebuffer.cpp
+++ b/libgralloc-qsd8k/framebuffer.cpp
@@ -403,7 +403,7 @@ int fb_device_open(hw_module_t const* module, const char* name,
             if (m->finfo.reserved[0] == 0x5444 &&
                     m->finfo.reserved[1] == 0x5055) {
                 dev->device.setUpdateRect = fb_setUpdateRect;
-                LOGD("UPDATE_ON_DEMAND supported");
+                ALOGD("UPDATE_ON_DEMAND supported");
             }
 
             *device = &dev->device.common;
diff --git a/libgralloc-qsd8k/mapper.cpp b/libgralloc-qsd8k/mapper.cpp
index 6de7346..ef24270 100644
--- a/libgralloc-qsd8k/mapper.cpp
+++ b/libgralloc-qsd8k/mapper.cpp
@@ -69,7 +69,7 @@ static int gralloc_map(gralloc_module_t const* module,
             return -errno;
         }
         hnd->base = intptr_t(mappedAddress) + hnd->offset;
-        //LOGD("gralloc_map() succeeded fd=%d, off=%d, size=%d, vaddr=%p", 
+        //ALOGD("gralloc_map() succeeded fd=%d, off=%d, size=%d, vaddr=%p", 
         //        hnd->fd, hnd->offset, hnd->size, mappedAddress);
     }
     *vaddr = (void*)hnd->base;
@@ -87,7 +87,7 @@ static int gralloc_unmap(gralloc_module_t const* module,
         base = (void*)(intptr_t(base) - hnd->offset);
         size += hnd->offset;
 #endif
-        //LOGD("unmapping from %p, size=%d", base, size);
+        //ALOGD("unmapping from %p, size=%d", base, size);
         if (munmap(base, size) < 0) {
             LOGE("Could not unmap %s", strerror(errno));
         }
@@ -215,7 +215,7 @@ int gralloc_lock(gralloc_module_t const* module,
                 return -EBUSY;
             } else {
                 // this is not an error
-                //LOGD("%p already locked for read... count = %d", 
+                //ALOGD("%p already locked for read... count = %d", 
                 //        handle, (current_value & ~(1<<31)));
             }
         }
diff --git a/libgralloc-qsd8k/pmemalloc.cpp b/libgralloc-qsd8k/pmemalloc.cpp
index afecd84..5bada4a 100644
--- a/libgralloc-qsd8k/pmemalloc.cpp
+++ b/libgralloc-qsd8k/pmemalloc.cpp
@@ -157,7 +157,7 @@ int PmemUserspaceAllocator::alloc_pmem_buffer(size_t size, int usage,
         } else {
             int openFlags = get_open_flags(usage);
 
-            //LOGD("%s: allocating pmem at offset 0x%p", pmemdev, offset);
+            //ALOGD("%s: allocating pmem at offset 0x%p", pmemdev, offset);
 
             // now create the "sub-heap"
             int fd = deps.open(pmemdev, openFlags, 0);
@@ -185,7 +185,7 @@ int PmemUserspaceAllocator::alloc_pmem_buffer(size_t size, int usage,
                 *pOffset = offset;
                 *pFd = fd;
             }
-            //LOGD_IF(!err, "%s: allocating pmem size=%d, offset=%d", pmemdev, size, offset);
+            //ALOGD_IF(!err, "%s: allocating pmem size=%d, offset=%d", pmemdev, size, offset);
         }
     }
     END_FUNC;
diff --git a/libgralloc/framebuffer.cpp b/libgralloc/framebuffer.cpp
index 35d0971..2bee7dd 100644
--- a/libgralloc/framebuffer.cpp
+++ b/libgralloc/framebuffer.cpp
@@ -367,7 +367,7 @@ int fb_device_open(hw_module_t const* module, const char* name,
             if (m->finfo.reserved[0] == 0x5444 &&
                     m->finfo.reserved[1] == 0x5055) {
                 dev->device.setUpdateRect = fb_setUpdateRect;
-                LOGD("UPDATE_ON_DEMAND supported");
+                ALOGD("UPDATE_ON_DEMAND supported");
             }
 
             *device = &dev->device.common;
diff --git a/libgralloc/gralloc.cpp b/libgralloc/gralloc.cpp
index 2424121..fdf0e85 100644
--- a/libgralloc/gralloc.cpp
+++ b/libgralloc/gralloc.cpp
@@ -254,15 +254,15 @@ static int init_gpu_area_locked(private_module_t* m)
             LOGE("HW3D_GET_REGIONS failed (%s)", strerror(errno));
             err = -errno;
         } else {
-            LOGD("smi: offset=%08lx, len=%08lx, phys=%p", 
+            ALOGD("smi: offset=%08lx, len=%08lx, phys=%p", 
                     regions[HW3D_SMI].map_offset, 
                     regions[HW3D_SMI].len, 
                     regions[HW3D_SMI].phys);
-            LOGD("ebi: offset=%08lx, len=%08lx, phys=%p", 
+            ALOGD("ebi: offset=%08lx, len=%08lx, phys=%p", 
                     regions[HW3D_EBI].map_offset,
                     regions[HW3D_EBI].len,
                     regions[HW3D_EBI].phys);
-            LOGD("reg: offset=%08lx, len=%08lx, phys=%p", 
+            ALOGD("reg: offset=%08lx, len=%08lx, phys=%p", 
                     regions[HW3D_REGS].map_offset,
                     regions[HW3D_REGS].len,
                     regions[HW3D_REGS].phys);
@@ -375,7 +375,7 @@ try_ashmem:
                     fd = -1;
                 }
                 memset((char*)base + offset, 0, size);
-                //LOGD_IF(!err, "allocating pmem size=%d, offset=%d", size, offset);
+                //ALOGD_IF(!err, "allocating pmem size=%d, offset=%d", size, offset);
             }
         } else {
             if ((usage & GRALLOC_USAGE_HW_2D) == 0) {
@@ -415,7 +415,7 @@ try_ashmem:
                     sleeptime += 250000;
                     usleep(sleeptime);
                 } else {
-                    LOGD("allocating GPU size=%d, offset=%d", size, offset);
+                    ALOGD("allocating GPU size=%d, offset=%d", size, offset);
                     fd = open("/dev/null", O_RDONLY); // just so marshalling doesn't fail
                     gpu_fd = m->gpu;
                     memset((char*)base + offset, 0, size);
@@ -545,7 +545,7 @@ static int gralloc_free(alloc_device_t* dev,
                 }
             }
         } else if (hnd->flags & private_handle_t::PRIV_FLAGS_USES_GPU) {
-            LOGD("freeing GPU buffer at %d", hnd->offset);
+            ALOGD("freeing GPU buffer at %d", hnd->offset);
             sAllocatorGPU.deallocate(hnd->offset);
         }
 
diff --git a/libgralloc/mapper.cpp b/libgralloc/mapper.cpp
index 7a5fdc6..33a0de2 100644
--- a/libgralloc/mapper.cpp
+++ b/libgralloc/mapper.cpp
@@ -69,7 +69,7 @@ static int gralloc_map(gralloc_module_t const* module,
             return -errno;
         }
         hnd->base = intptr_t(mappedAddress) + hnd->offset;
-        //LOGD("gralloc_map() succeeded fd=%d, off=%d, size=%d, vaddr=%p", 
+        //ALOGD("gralloc_map() succeeded fd=%d, off=%d, size=%d, vaddr=%p", 
         //        hnd->fd, hnd->offset, hnd->size, mappedAddress);
     }
     *vaddr = (void*)hnd->base;
@@ -87,7 +87,7 @@ static int gralloc_unmap(gralloc_module_t const* module,
         base = (void*)(intptr_t(base) - hnd->offset);
         size += hnd->offset;
 #endif
-        //LOGD("unmapping from %p, size=%d, flags=%08x", base, size, hnd->flags);
+        //ALOGD("unmapping from %p, size=%d, flags=%08x", base, size, hnd->flags);
         if (munmap(base, size) < 0) {
             LOGE("Could not unmap %s", strerror(errno));
         }
diff --git a/liblights/lights.c b/liblights/lights.c
index b6e7926..c7ddd9a 100644
--- a/liblights/lights.c
+++ b/liblights/lights.c
@@ -220,7 +220,7 @@ set_speaker_light_locked(struct light_device_t* dev,
     colorRGB = state->color;
 
 #if 0
-    LOGD("set_speaker_light_locked colorRGB=%08X, onMS=%d, offMS=%d\n",
+    ALOGD("set_speaker_light_locked colorRGB=%08X, onMS=%d, offMS=%d\n",
             colorRGB, onMS, offMS);
 #endif