diff options
| author | Steve Block <steveblock@google.com> | 2012-01-04 10:13:13 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-01-04 10:13:13 -0800 |
| commit | 41891aeaf4e6e4006ae3087fa537786e9ec8caa4 (patch) | |
| tree | 919fcb8f1583cb4357f16468b1fc6eaf1a5b0144 /libs/gui | |
| parent | 7c48707a9d320230452d5937239f28ab0ea2e695 (diff) | |
| parent | 5baa3a62a97544669fba6d65a11c07f252e654dd (diff) | |
| download | frameworks_base-41891aeaf4e6e4006ae3087fa537786e9ec8caa4.zip frameworks_base-41891aeaf4e6e4006ae3087fa537786e9ec8caa4.tar.gz frameworks_base-41891aeaf4e6e4006ae3087fa537786e9ec8caa4.tar.bz2 | |
Merge "Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGE"
Diffstat (limited to 'libs/gui')
| -rw-r--r-- | libs/gui/SurfaceTexture.cpp | 2 | ||||
| -rw-r--r-- | libs/gui/SurfaceTextureClient.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/libs/gui/SurfaceTexture.cpp b/libs/gui/SurfaceTexture.cpp index 4310bed..fa0ee8c 100644 --- a/libs/gui/SurfaceTexture.cpp +++ b/libs/gui/SurfaceTexture.cpp @@ -63,7 +63,7 @@ // Macros for including the SurfaceTexture name in log messages #define ST_LOGV(x, ...) ALOGV("[%s] "x, mName.string(), ##__VA_ARGS__) -#define ST_LOGD(x, ...) LOGD("[%s] "x, mName.string(), ##__VA_ARGS__) +#define ST_LOGD(x, ...) ALOGD("[%s] "x, mName.string(), ##__VA_ARGS__) #define ST_LOGI(x, ...) LOGI("[%s] "x, mName.string(), ##__VA_ARGS__) #define ST_LOGW(x, ...) LOGW("[%s] "x, mName.string(), ##__VA_ARGS__) #define ST_LOGE(x, ...) LOGE("[%s] "x, mName.string(), ##__VA_ARGS__) diff --git a/libs/gui/SurfaceTextureClient.cpp b/libs/gui/SurfaceTextureClient.cpp index 691b52d..b6f3c11 100644 --- a/libs/gui/SurfaceTextureClient.cpp +++ b/libs/gui/SurfaceTextureClient.cpp @@ -185,13 +185,13 @@ int SurfaceTextureClient::getSlotFromBufferLocked( // a buffer. if (mSlots[i] == NULL) { if (!dumpedState) { - LOGD("getSlotFromBufferLocked: encountered NULL buffer in slot %d " + ALOGD("getSlotFromBufferLocked: encountered NULL buffer in slot %d " "looking for buffer %p", i, buffer->handle); for (int j = 0; j < NUM_BUFFER_SLOTS; j++) { if (mSlots[j] == NULL) { - LOGD("getSlotFromBufferLocked: %02d: NULL", j); + ALOGD("getSlotFromBufferLocked: %02d: NULL", j); } else { - LOGD("getSlotFromBufferLocked: %02d: %p", j, mSlots[j]->handle); + ALOGD("getSlotFromBufferLocked: %02d: %p", j, mSlots[j]->handle); } } dumpedState = true; |