diff options
author | Andreas Gampe <agampe@google.com> | 2014-11-20 22:02:20 -0800 |
---|---|---|
committer | Andreas Gampe <agampe@google.com> | 2014-11-21 10:15:08 -0800 |
commit | ed6b9dff563c5e22f040ff37e12c0d771e0478ae (patch) | |
tree | de1338ef208f874dd3c92a255a0c98c4d6f21cf3 /core/jni/android_view_GraphicBuffer.cpp | |
parent | f926d71b8ef2790da067550144860705c1a61fe5 (diff) | |
download | frameworks_base-ed6b9dff563c5e22f040ff37e12c0d771e0478ae.zip frameworks_base-ed6b9dff563c5e22f040ff37e12c0d771e0478ae.tar.gz frameworks_base-ed6b9dff563c5e22f040ff37e12c0d771e0478ae.tar.bz2 |
Frameworks/base: Consistency in core/jni
Make consistent use of core_jni_helpers for registration.
Translate some #ifdefs into const bools.
Change-Id: I37639aa053dd50f003a552cbd8550dddecc811c5
Diffstat (limited to 'core/jni/android_view_GraphicBuffer.cpp')
-rw-r--r-- | core/jni/android_view_GraphicBuffer.cpp | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/core/jni/android_view_GraphicBuffer.cpp b/core/jni/android_view_GraphicBuffer.cpp index 7f1af49..a12629f 100644 --- a/core/jni/android_view_GraphicBuffer.cpp +++ b/core/jni/android_view_GraphicBuffer.cpp @@ -47,16 +47,7 @@ namespace android { // ---------------------------------------------------------------------------- // Debug -#define DEBUG_GRAPHIC_BUFFER 0 - -// Debug -#if DEBUG_GRAPHIC_BUFFER - #define GB_LOGD(...) ALOGD(__VA_ARGS__) - #define GB_LOGW(...) ALOGW(__VA_ARGS__) -#else - #define GB_LOGD(...) - #define GB_LOGW(...) -#endif +static const bool kDebugGraphicBuffer = false; #define LOCK_CANVAS_USAGE GraphicBuffer::USAGE_SW_READ_OFTEN | GraphicBuffer::USAGE_SW_WRITE_OFTEN @@ -118,14 +109,18 @@ static jlong android_view_GraphiceBuffer_create(JNIEnv* env, jobject clazz, sp<ISurfaceComposer> composer(ComposerService::getComposerService()); sp<IGraphicBufferAlloc> alloc(composer->createGraphicBufferAlloc()); if (alloc == NULL) { - GB_LOGW("createGraphicBufferAlloc() failed in GraphicBuffer.create()"); + if (kDebugGraphicBuffer) { + ALOGW("createGraphicBufferAlloc() failed in GraphicBuffer.create()"); + } return NULL; } status_t error; sp<GraphicBuffer> buffer(alloc->createGraphicBuffer(width, height, format, usage, &error)); if (buffer == NULL) { - GB_LOGW("createGraphicBuffer() failed in GraphicBuffer.create()"); + if (kDebugGraphicBuffer) { + ALOGW("createGraphicBuffer() failed in GraphicBuffer.create()"); + } return NULL; } |