diff options
author | Steve Block <steveblock@google.com> | 2011-12-20 16:23:08 +0000 |
---|---|---|
committer | Steve Block <steveblock@google.com> | 2012-01-03 22:38:27 +0000 |
commit | 9d4536835248525f32f1504a3d28d5bbfa0a2910 (patch) | |
tree | d75ee99e732f634ca5892b52fa869ce520df29c9 /services | |
parent | 7aa67d5ba2af9cf9998f47c5b47be86df81804a6 (diff) | |
download | frameworks_native-9d4536835248525f32f1504a3d28d5bbfa0a2910.zip frameworks_native-9d4536835248525f32f1504a3d28d5bbfa0a2910.tar.gz frameworks_native-9d4536835248525f32f1504a3d28d5bbfa0a2910.tar.bz2 |
Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGE
See https://android-git.corp.google.com/g/156016
Bug: 5449033
Change-Id: I4c4e33bb9df3e39e11cd985e193e6fbab4635298
Diffstat (limited to 'services')
-rw-r--r-- | services/surfaceflinger/DisplayHardware/DisplayHardwareBase.cpp | 4 | ||||
-rw-r--r-- | services/surfaceflinger/Layer.cpp | 4 | ||||
-rw-r--r-- | services/surfaceflinger/SurfaceFlinger.cpp | 6 | ||||
-rw-r--r-- | services/surfaceflinger/SurfaceTextureLayer.cpp | 4 | ||||
-rw-r--r-- | services/surfaceflinger/Transform.cpp | 8 | ||||
-rw-r--r-- | services/surfaceflinger/tests/Transaction_test.cpp | 8 |
6 files changed, 17 insertions, 17 deletions
diff --git a/services/surfaceflinger/DisplayHardware/DisplayHardwareBase.cpp b/services/surfaceflinger/DisplayHardware/DisplayHardwareBase.cpp index 3b7c09e..174dcd7 100644 --- a/services/surfaceflinger/DisplayHardware/DisplayHardwareBase.cpp +++ b/services/surfaceflinger/DisplayHardware/DisplayHardwareBase.cpp @@ -79,7 +79,7 @@ bool DisplayHardwareBase::DisplayEventThread::threadLoop() LOGW_IF(err<0, "ANDROID_WAIT_FOR_FB_SLEEP failed (%s)", strerror(errno)); if (err >= 0) { sp<SurfaceFlinger> flinger = mFlinger.promote(); - LOGD("About to give-up screen, flinger = %p", flinger.get()); + ALOGD("About to give-up screen, flinger = %p", flinger.get()); if (flinger != 0) { mBarrier.close(); flinger->screenReleased(0); @@ -94,7 +94,7 @@ bool DisplayHardwareBase::DisplayEventThread::threadLoop() LOGW_IF(err<0, "ANDROID_WAIT_FOR_FB_WAKE failed (%s)", strerror(errno)); if (err >= 0) { sp<SurfaceFlinger> flinger = mFlinger.promote(); - LOGD("Screen about to return, flinger = %p", flinger.get()); + ALOGD("Screen about to return, flinger = %p", flinger.get()); if (flinger != 0) flinger->screenAcquired(0); } diff --git a/services/surfaceflinger/Layer.cpp b/services/surfaceflinger/Layer.cpp index d3b0dbf..d4c4b1f 100644 --- a/services/surfaceflinger/Layer.cpp +++ b/services/surfaceflinger/Layer.cpp @@ -350,7 +350,7 @@ uint32_t Layer::doTransaction(uint32_t flags) if (sizeChanged) { // the size changed, we need to ask our client to request a new buffer - LOGD_IF(DEBUG_RESIZE, + ALOGD_IF(DEBUG_RESIZE, "doTransaction: " "resize (layer=%p), requested (%dx%d), drawing (%d,%d), " "scalingMode=%d", @@ -485,7 +485,7 @@ void Layer::lockPageFlip(bool& recomputeVisibleRegions) recomputeVisibleRegions = true; } - LOGD_IF(DEBUG_RESIZE, + ALOGD_IF(DEBUG_RESIZE, "lockPageFlip : " " (layer=%p), buffer (%ux%u, tr=%02x), " "requested (%dx%d)", diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp index 014c7e2..96a0fd6 100644 --- a/services/surfaceflinger/SurfaceFlinger.cpp +++ b/services/surfaceflinger/SurfaceFlinger.cpp @@ -1290,7 +1290,7 @@ sp<ISurface> SurfaceFlinger::createSurface( return surfaceHandle; } - //LOGD("createSurface for pid %d (%d x %d)", pid, w, h); + //ALOGD("createSurface for pid %d (%d x %d)", pid, w, h); sp<Layer> normalLayer; switch (flags & eFXSurfaceMask) { case eFXSurfaceNormal: @@ -2279,7 +2279,7 @@ status_t SurfaceFlinger::captureScreenImplLocked(DisplayID dpy, sh = (!sh) ? hw_h : sh; const size_t size = sw * sh * 4; - //LOGD("screenshot: sw=%d, sh=%d, minZ=%d, maxZ=%d", + //ALOGD("screenshot: sw=%d, sh=%d, minZ=%d, maxZ=%d", // sw, sh, minLayerZ, maxLayerZ); // make sure to clear all GL error flags @@ -2370,7 +2370,7 @@ status_t SurfaceFlinger::captureScreenImplLocked(DisplayID dpy, hw.compositionComplete(); - // LOGD("screenshot: result = %s", result<0 ? strerror(result) : "OK"); + // ALOGD("screenshot: result = %s", result<0 ? strerror(result) : "OK"); return result; } diff --git a/services/surfaceflinger/SurfaceTextureLayer.cpp b/services/surfaceflinger/SurfaceTextureLayer.cpp index 5020e00..259b937 100644 --- a/services/surfaceflinger/SurfaceTextureLayer.cpp +++ b/services/surfaceflinger/SurfaceTextureLayer.cpp @@ -37,7 +37,7 @@ SurfaceTextureLayer::~SurfaceTextureLayer() { status_t SurfaceTextureLayer::setDefaultBufferSize(uint32_t w, uint32_t h) { - //LOGD("%s, w=%u, h=%u", __PRETTY_FUNCTION__, w, h); + //ALOGD("%s, w=%u, h=%u", __PRETTY_FUNCTION__, w, h); return SurfaceTexture::setDefaultBufferSize(w, h); } @@ -73,7 +73,7 @@ status_t SurfaceTextureLayer::dequeueBuffer(int *buf, if (format == 0) format = mDefaultFormat; uint32_t effectiveUsage = layer->getEffectiveUsage(usage); - //LOGD("%s, w=%u, h=%u, format=%u, usage=%08x, effectiveUsage=%08x", + //ALOGD("%s, w=%u, h=%u, format=%u, usage=%08x, effectiveUsage=%08x", // __PRETTY_FUNCTION__, w, h, format, usage, effectiveUsage); res = SurfaceTexture::dequeueBuffer(buf, w, h, format, effectiveUsage); } diff --git a/services/surfaceflinger/Transform.cpp b/services/surfaceflinger/Transform.cpp index ba345ce..ca3fa6e 100644 --- a/services/surfaceflinger/Transform.cpp +++ b/services/surfaceflinger/Transform.cpp @@ -344,10 +344,10 @@ void Transform::dump(const char* name) const if (mType&TRANSLATE) type.append("TRANSLATE "); - LOGD("%s 0x%08x (%s, %s)", name, mType, flags.string(), type.string()); - LOGD("%.4f %.4f %.4f", m[0][0], m[1][0], m[2][0]); - LOGD("%.4f %.4f %.4f", m[0][1], m[1][1], m[2][1]); - LOGD("%.4f %.4f %.4f", m[0][2], m[1][2], m[2][2]); + ALOGD("%s 0x%08x (%s, %s)", name, mType, flags.string(), type.string()); + ALOGD("%.4f %.4f %.4f", m[0][0], m[1][0], m[2][0]); + ALOGD("%.4f %.4f %.4f", m[0][1], m[1][1], m[2][1]); + ALOGD("%.4f %.4f %.4f", m[0][2], m[1][2], m[2][2]); } // --------------------------------------------------------------------------- diff --git a/services/surfaceflinger/tests/Transaction_test.cpp b/services/surfaceflinger/tests/Transaction_test.cpp index afafd8a..396a3fd 100644 --- a/services/surfaceflinger/tests/Transaction_test.cpp +++ b/services/surfaceflinger/tests/Transaction_test.cpp @@ -204,11 +204,11 @@ TEST_F(LayerUpdateTest, LayerResizeWorks) { sc->checkPixel(145, 145, 63, 63, 195); } - LOGD("resizing"); + ALOGD("resizing"); SurfaceComposerClient::openGlobalTransaction(); ASSERT_EQ(NO_ERROR, mFGSurfaceControl->setSize(128, 128)); SurfaceComposerClient::closeGlobalTransaction(true); - LOGD("resized"); + ALOGD("resized"); { // This should not reflect the new size or color because SurfaceFlinger // has not yet received a buffer of the correct size. @@ -219,10 +219,10 @@ TEST_F(LayerUpdateTest, LayerResizeWorks) { sc->checkPixel(145, 145, 63, 63, 195); } - LOGD("drawing"); + ALOGD("drawing"); fillSurfaceRGBA8(mFGSurfaceControl, 63, 195, 63); waitForPostedBuffers(); - LOGD("drawn"); + ALOGD("drawn"); { // This should reflect the new size and the new color. SCOPED_TRACE("after redraw"); |