diff options
| author | 2012-04-17 15:52:49 -0700 | |
|---|---|---|
| committer | 2012-04-17 15:52:49 -0700 | |
| commit | 2efa4b2bb0128cd65ea8ade46f46bacaf72c194f (patch) | |
| tree | 7f3fe9bc1e530e9300e6547ce0757f80c93c7e0b /libs/gui/BufferQueue.cpp | |
| parent | fe668f468252b8824f777ffd659e5d800283a9a1 (diff) | |
| parent | 695e331f01b136155b1559b3c878b7c5bb631bc1 (diff) | |
Merge changes Id79430f9,I541d3046
* changes:
BufferQueue: check before tracing buffer index
SurfaceTexture: shrink all sides when cropping
Diffstat (limited to 'libs/gui/BufferQueue.cpp')
| -rw-r--r-- | libs/gui/BufferQueue.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/libs/gui/BufferQueue.cpp b/libs/gui/BufferQueue.cpp index 01d08b70de..ece04944b0 100644 --- a/libs/gui/BufferQueue.cpp +++ b/libs/gui/BufferQueue.cpp @@ -57,9 +57,12 @@ #define ST_LOGE(x, ...) ALOGE("[%s] "x, mConsumerName.string(), ##__VA_ARGS__) #define ATRACE_BUFFER_INDEX(index) \ - char ___traceBuf[1024]; \ - snprintf(___traceBuf, 1024, "%s: %d", mConsumerName.string(), (index)); \ - android::ScopedTrace ___bufTracer(ATRACE_TAG, ___traceBuf); + if (ATRACE_ENABLED()) { \ + char ___traceBuf[1024]; \ + snprintf(___traceBuf, 1024, "%s: %d", mConsumerName.string(), \ + (index)); \ + android::ScopedTrace ___bufTracer(ATRACE_TAG, ___traceBuf); \ + } namespace android { |