diff options
| author | 2012-01-19 17:26:08 -0800 | |
|---|---|---|
| committer | 2012-01-19 17:26:08 -0800 | |
| commit | 29964df372b737e3785871e5c31f16d4cd33a1bd (patch) | |
| tree | 161809f0b6cb8029212c8fa18c8b0829927dfa3a /libs/gui/SurfaceTexture.cpp | |
| parent | 381857ed67c640a6c00d5dfaa4d4cba0a11e810b (diff) | |
| parent | 86c9a50ef8d61f433c478d4ba1bd8ad017eb64c1 (diff) | |
am a826f9e2: Merge "Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)"
* commit 'a826f9e2c4f6329d8d48c927f6e942e78ffaf92f':
Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)
Diffstat (limited to 'libs/gui/SurfaceTexture.cpp')
| -rw-r--r-- | libs/gui/SurfaceTexture.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libs/gui/SurfaceTexture.cpp b/libs/gui/SurfaceTexture.cpp index 774e75bd24..91294ed4f8 100644 --- a/libs/gui/SurfaceTexture.cpp +++ b/libs/gui/SurfaceTexture.cpp @@ -63,7 +63,7 @@ #define ST_LOGV(x, ...) ALOGV("[%s] "x, mName.string(), ##__VA_ARGS__) #define ST_LOGD(x, ...) ALOGD("[%s] "x, mName.string(), ##__VA_ARGS__) #define ST_LOGI(x, ...) ALOGI("[%s] "x, mName.string(), ##__VA_ARGS__) -#define ST_LOGW(x, ...) LOGW("[%s] "x, mName.string(), ##__VA_ARGS__) +#define ST_LOGW(x, ...) ALOGW("[%s] "x, mName.string(), ##__VA_ARGS__) #define ST_LOGE(x, ...) LOGE("[%s] "x, mName.string(), ##__VA_ARGS__) namespace android { @@ -350,7 +350,7 @@ status_t SurfaceTexture::dequeueBuffer(int *outBuf, uint32_t w, uint32_t h, } // if buffer is FREE it CANNOT be current - LOGW_IF((state == BufferSlot::FREE) && (mCurrentTexture==i), + ALOGW_IF((state == BufferSlot::FREE) && (mCurrentTexture==i), "dequeueBuffer: buffer %d is both FREE and current!", i); @@ -990,7 +990,7 @@ void SurfaceTexture::freeBufferLocked(int i) { } void SurfaceTexture::freeAllBuffersLocked() { - LOGW_IF(!mQueue.isEmpty(), + ALOGW_IF(!mQueue.isEmpty(), "freeAllBuffersLocked called but mQueue is not empty"); mCurrentTexture = INVALID_BUFFER_SLOT; for (int i = 0; i < NUM_BUFFER_SLOTS; i++) { @@ -999,7 +999,7 @@ void SurfaceTexture::freeAllBuffersLocked() { } void SurfaceTexture::freeAllBuffersExceptHeadLocked() { - LOGW_IF(!mQueue.isEmpty(), + ALOGW_IF(!mQueue.isEmpty(), "freeAllBuffersExceptCurrentLocked called but mQueue is not empty"); int head = -1; if (!mQueue.empty()) { |