diff options
author | Steve Block <steveblock@google.com> | 2012-01-06 19:20:56 +0000 |
---|---|---|
committer | Steve Block <steveblock@google.com> | 2012-01-08 13:19:13 +0000 |
commit | 3762c311729fe9f3af085c14c5c1fb471d994c03 (patch) | |
tree | 7d4caccad80ac7327c7bff96dafc857d5f4631ad /core/jni/android | |
parent | 7a939077bd14521c7d351af98df7ed75a8ec9c15 (diff) | |
download | frameworks_base-3762c311729fe9f3af085c14c5c1fb471d994c03.zip frameworks_base-3762c311729fe9f3af085c14c5c1fb471d994c03.tar.gz frameworks_base-3762c311729fe9f3af085c14c5c1fb471d994c03.tar.bz2 |
Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE
See https://android-git.corp.google.com/g/#/c/157220
Bug: 5449033
Change-Id: Ic9c19d30693bd56755f55906127cd6bd7126096c
Diffstat (limited to 'core/jni/android')
-rw-r--r-- | core/jni/android/graphics/Canvas.cpp | 2 | ||||
-rw-r--r-- | core/jni/android/graphics/Graphics.cpp | 2 | ||||
-rw-r--r-- | core/jni/android/graphics/SurfaceTexture.cpp | 8 | ||||
-rw-r--r-- | core/jni/android/graphics/TextLayout.cpp | 6 | ||||
-rw-r--r-- | core/jni/android/opengl/util.cpp | 2 |
5 files changed, 10 insertions, 10 deletions
diff --git a/core/jni/android/graphics/Canvas.cpp b/core/jni/android/graphics/Canvas.cpp index 8d05e28..4aa13f9 100644 --- a/core/jni/android/graphics/Canvas.cpp +++ b/core/jni/android/graphics/Canvas.cpp @@ -762,7 +762,7 @@ public: value = TextLayoutCache::getInstance().getValue(paint, textArray, start, count, contextCount, flags); if (value == NULL) { - LOGE("Cannot get TextLayoutCache value for text = '%s'", + ALOGE("Cannot get TextLayoutCache value for text = '%s'", String8(textArray + start, count).string()); return ; } diff --git a/core/jni/android/graphics/Graphics.cpp b/core/jni/android/graphics/Graphics.cpp index 64bd207..47ffd94 100644 --- a/core/jni/android/graphics/Graphics.cpp +++ b/core/jni/android/graphics/Graphics.cpp @@ -40,7 +40,7 @@ void doThrowIOE(JNIEnv* env, const char* msg) { bool GraphicsJNI::hasException(JNIEnv *env) { if (env->ExceptionCheck() != 0) { - LOGE("*** Uncaught exception returned from Java call!\n"); + ALOGE("*** Uncaught exception returned from Java call!\n"); env->ExceptionDescribe(); return true; } diff --git a/core/jni/android/graphics/SurfaceTexture.cpp b/core/jni/android/graphics/SurfaceTexture.cpp index 9e697b4..3d350ed 100644 --- a/core/jni/android/graphics/SurfaceTexture.cpp +++ b/core/jni/android/graphics/SurfaceTexture.cpp @@ -112,7 +112,7 @@ JNIEnv* JNISurfaceTextureContext::getJNIEnv(bool* needsDetach) { JavaVM* vm = AndroidRuntime::getJavaVM(); int result = vm->AttachCurrentThread(&env, (void*) &args); if (result != JNI_OK) { - LOGE("thread attach failed: %#x", result); + ALOGE("thread attach failed: %#x", result); return NULL; } *needsDetach = true; @@ -124,7 +124,7 @@ void JNISurfaceTextureContext::detachJNI() { JavaVM* vm = AndroidRuntime::getJavaVM(); int result = vm->DetachCurrentThread(); if (result != JNI_OK) { - LOGE("thread detach failed: %#x", result); + ALOGE("thread detach failed: %#x", result); } } @@ -164,14 +164,14 @@ static void SurfaceTexture_classInit(JNIEnv* env, jclass clazz) fields.surfaceTexture = env->GetFieldID(clazz, ANDROID_GRAPHICS_SURFACETEXTURE_JNI_ID, "I"); if (fields.surfaceTexture == NULL) { - LOGE("can't find android/graphics/SurfaceTexture.%s", + ALOGE("can't find android/graphics/SurfaceTexture.%s", ANDROID_GRAPHICS_SURFACETEXTURE_JNI_ID); } fields.postEvent = env->GetStaticMethodID(clazz, "postEventFromNative", "(Ljava/lang/Object;)V"); if (fields.postEvent == NULL) { - LOGE("can't find android/graphics/SurfaceTexture.postEventFromNative"); + ALOGE("can't find android/graphics/SurfaceTexture.postEventFromNative"); } } diff --git a/core/jni/android/graphics/TextLayout.cpp b/core/jni/android/graphics/TextLayout.cpp index 5099510..2d83851 100644 --- a/core/jni/android/graphics/TextLayout.cpp +++ b/core/jni/android/graphics/TextLayout.cpp @@ -64,7 +64,7 @@ void TextLayout::handleText(SkPaint *paint, const jchar* text, jsize len, reinterpret_cast<const UChar*>(text), 0, len, len, bidiFlags); #endif if (value == NULL) { - LOGE("Cannot get TextLayoutCache value for text = '%s'", + ALOGE("Cannot get TextLayoutCache value for text = '%s'", String8(text, len).string()); return ; } @@ -88,7 +88,7 @@ void TextLayout::getTextRunAdvances(SkPaint* paint, const jchar* chars, jint sta reinterpret_cast<const UChar*>(chars), start, count, contextCount, dirFlags); #endif if (value == NULL) { - LOGE("Cannot get TextLayoutCache value for text = '%s'", + ALOGE("Cannot get TextLayoutCache value for text = '%s'", String8(chars + start, count).string()); return ; } @@ -136,7 +136,7 @@ void TextLayout::drawTextOnPath(SkPaint* paint, const jchar* text, int count, reinterpret_cast<const UChar*>(text), 0, count, count, bidiFlags); #endif if (value == NULL) { - LOGE("Cannot get TextLayoutCache value for text = '%s'", + ALOGE("Cannot get TextLayoutCache value for text = '%s'", String8(text, count).string()); return ; } diff --git a/core/jni/android/opengl/util.cpp b/core/jni/android/opengl/util.cpp index 93717f3..929df540 100644 --- a/core/jni/android/opengl/util.cpp +++ b/core/jni/android/opengl/util.cpp @@ -1062,7 +1062,7 @@ int register_android_opengl_classes(JNIEnv* env) result = AndroidRuntime::registerNativeMethods(env, cri->classPath, cri->methods, cri->methodCount); if (result < 0) { - LOGE("Failed to register %s: %d", cri->classPath, result); + ALOGE("Failed to register %s: %d", cri->classPath, result); break; } } |