diff options
author | Steve Block <steveblock@google.com> | 2012-01-05 23:22:43 +0000 |
---|---|---|
committer | Steve Block <steveblock@google.com> | 2012-01-06 10:07:54 +0000 |
commit | 32397c1cd3327905173b36baa6fd1c579bc328ff (patch) | |
tree | 6eec8d541334d19af13d46239d603d86f52eefd7 /services | |
parent | 5f56dfec5aa6d9ff63c08112fb5d60efd813b549 (diff) | |
download | frameworks_native-32397c1cd3327905173b36baa6fd1c579bc328ff.zip frameworks_native-32397c1cd3327905173b36baa6fd1c579bc328ff.tar.gz frameworks_native-32397c1cd3327905173b36baa6fd1c579bc328ff.tar.bz2 |
Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGE
See https://android-git.corp.google.com/g/157065
Bug: 5449033
Change-Id: I00a4b904f9449e6f93b7fd35eac28640d7929e69
Diffstat (limited to 'services')
5 files changed, 9 insertions, 9 deletions
diff --git a/services/surfaceflinger/DisplayHardware/DisplayHardware.cpp b/services/surfaceflinger/DisplayHardware/DisplayHardware.cpp index 2ffbd1e..82c5295 100644 --- a/services/surfaceflinger/DisplayHardware/DisplayHardware.cpp +++ b/services/surfaceflinger/DisplayHardware/DisplayHardware.cpp @@ -173,7 +173,7 @@ void DisplayHardware::init(uint32_t dpy) char property[PROPERTY_VALUE_MAX]; if (property_get("debug.sf.hw", property, NULL) > 0) { if (atoi(property) == 0) { - LOGW("H/W composition disabled"); + ALOGW("H/W composition disabled"); attribs[2] = EGL_CONFIG_CAVEAT; attribs[3] = EGL_SLOW_CONFIG; } @@ -231,7 +231,7 @@ void DisplayHardware::init(uint32_t dpy) */ if (property_get("qemu.sf.lcd_density", property, NULL) <= 0) { if (property_get("ro.sf.lcd_density", property, NULL) <= 0) { - LOGW("ro.sf.lcd_density not defined, using 160 dpi by default."); + ALOGW("ro.sf.lcd_density not defined, using 160 dpi by default."); strcpy(property, "160"); } } else { diff --git a/services/surfaceflinger/DisplayHardware/DisplayHardwareBase.cpp b/services/surfaceflinger/DisplayHardware/DisplayHardwareBase.cpp index 174dcd7..f4afeea 100644 --- a/services/surfaceflinger/DisplayHardware/DisplayHardwareBase.cpp +++ b/services/surfaceflinger/DisplayHardware/DisplayHardwareBase.cpp @@ -76,7 +76,7 @@ bool DisplayHardwareBase::DisplayEventThread::threadLoop() err = read(fd, &buf, 1); } while (err < 0 && errno == EINTR); close(fd); - LOGW_IF(err<0, "ANDROID_WAIT_FOR_FB_SLEEP failed (%s)", strerror(errno)); + ALOGW_IF(err<0, "ANDROID_WAIT_FOR_FB_SLEEP failed (%s)", strerror(errno)); if (err >= 0) { sp<SurfaceFlinger> flinger = mFlinger.promote(); ALOGD("About to give-up screen, flinger = %p", flinger.get()); @@ -91,7 +91,7 @@ bool DisplayHardwareBase::DisplayEventThread::threadLoop() err = read(fd, &buf, 1); } while (err < 0 && errno == EINTR); close(fd); - LOGW_IF(err<0, "ANDROID_WAIT_FOR_FB_WAKE failed (%s)", strerror(errno)); + ALOGW_IF(err<0, "ANDROID_WAIT_FOR_FB_WAKE failed (%s)", strerror(errno)); if (err >= 0) { sp<SurfaceFlinger> flinger = mFlinger.promote(); ALOGD("Screen about to return, flinger = %p", flinger.get()); diff --git a/services/surfaceflinger/DisplayHardware/HWComposer.cpp b/services/surfaceflinger/DisplayHardware/HWComposer.cpp index be9b226..68a5a2c 100644 --- a/services/surfaceflinger/DisplayHardware/HWComposer.cpp +++ b/services/surfaceflinger/DisplayHardware/HWComposer.cpp @@ -44,7 +44,7 @@ HWComposer::HWComposer(const sp<SurfaceFlinger>& flinger) mDpy(EGL_NO_DISPLAY), mSur(EGL_NO_SURFACE) { int err = hw_get_module(HWC_HARDWARE_MODULE_ID, &mModule); - LOGW_IF(err, "%s module not found", HWC_HARDWARE_MODULE_ID); + ALOGW_IF(err, "%s module not found", HWC_HARDWARE_MODULE_ID); if (err == 0) { err = hwc_open(mModule, &mHwc); LOGE_IF(err, "%s device failed to initialize (%s)", diff --git a/services/surfaceflinger/LayerScreenshot.cpp b/services/surfaceflinger/LayerScreenshot.cpp index 68e6660..c127fa6 100644 --- a/services/surfaceflinger/LayerScreenshot.cpp +++ b/services/surfaceflinger/LayerScreenshot.cpp @@ -93,7 +93,7 @@ uint32_t LayerScreenshot::doTransaction(uint32_t flags) // we're going from hidden to visible status_t err = captureLocked(); if (err != NO_ERROR) { - LOGW("createScreenshotSurface failed (%s)", strerror(-err)); + ALOGW("createScreenshotSurface failed (%s)", strerror(-err)); } } } else if (curr.flags & ISurfaceComposer::eLayerHidden) { diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp index e77f08f..cb67385 100644 --- a/services/surfaceflinger/SurfaceFlinger.cpp +++ b/services/surfaceflinger/SurfaceFlinger.cpp @@ -458,7 +458,7 @@ void SurfaceFlinger::postFramebuffer() { // this should never happen. we do the flip anyways so we don't // risk to cause a deadlock with hwc - LOGW_IF(mSwapRegion.isEmpty(), "mSwapRegion is empty"); + ALOGW_IF(mSwapRegion.isEmpty(), "mSwapRegion is empty"); const DisplayHardware& hw(graphicPlane(0).displayHardware()); const nsecs_t now = systemTime(); mDebugInSwapBuffers = now; @@ -1220,7 +1220,7 @@ void SurfaceFlinger::setTransactionState(const Vector<ComposerState>& state, mCurrentState.orientation = orientation; transactionFlags |= eTransactionNeeded; } else if (orientation != eOrientationUnchanged) { - LOGW("setTransactionState: ignoring unrecognized orientation: %d", + ALOGW("setTransactionState: ignoring unrecognized orientation: %d", orientation); } } @@ -1246,7 +1246,7 @@ void SurfaceFlinger::setTransactionState(const Vector<ComposerState>& state, if (CC_UNLIKELY(err != NO_ERROR)) { // just in case something goes wrong in SF, return to the // called after a few seconds. - LOGW_IF(err == TIMED_OUT, "closeGlobalTransaction timed out!"); + ALOGW_IF(err == TIMED_OUT, "closeGlobalTransaction timed out!"); mTransationPending = false; break; } |