From ed6b9dff563c5e22f040ff37e12c0d771e0478ae Mon Sep 17 00:00:00 2001 From: Andreas Gampe Date: Thu, 20 Nov 2014 22:02:20 -0800 Subject: Frameworks/base: Consistency in core/jni Make consistent use of core_jni_helpers for registration. Translate some #ifdefs into const bools. Change-Id: I37639aa053dd50f003a552cbd8550dddecc811c5 --- core/jni/android_view_GraphicBuffer.cpp | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) (limited to 'core/jni/android_view_GraphicBuffer.cpp') 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 composer(ComposerService::getComposerService()); sp 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 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; } -- cgit v1.1