diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-01-19 17:26:08 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-01-19 17:26:08 -0800 |
| commit | f3f650db96d40014a0203393c585c368b0dd7a9a (patch) | |
| tree | 7a70859dd347a8240ee02e950ea2eb1a1dad76e5 /core/jni/android | |
| parent | 08d3c6e5ba5c3e5fcc386b07efa709325d45b9ff (diff) | |
| parent | a826f9e2c4f6329d8d48c927f6e942e78ffaf92f (diff) | |
| download | frameworks_base-f3f650db96d40014a0203393c585c368b0dd7a9a.zip frameworks_base-f3f650db96d40014a0203393c585c368b0dd7a9a.tar.gz frameworks_base-f3f650db96d40014a0203393c585c368b0dd7a9a.tar.bz2 | |
am a826f9e2: Merge "Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)"
* commit 'a826f9e2c4f6329d8d48c927f6e942e78ffaf92f':
Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)
Diffstat (limited to 'core/jni/android')
| -rw-r--r-- | core/jni/android/graphics/SurfaceTexture.cpp | 4 | ||||
| -rw-r--r-- | core/jni/android/graphics/TextLayout.cpp | 2 | ||||
| -rw-r--r-- | core/jni/android/graphics/TextLayoutCache.cpp | 8 |
3 files changed, 7 insertions, 7 deletions
diff --git a/core/jni/android/graphics/SurfaceTexture.cpp b/core/jni/android/graphics/SurfaceTexture.cpp index de2d8c4..9e697b4 100644 --- a/core/jni/android/graphics/SurfaceTexture.cpp +++ b/core/jni/android/graphics/SurfaceTexture.cpp @@ -136,7 +136,7 @@ JNISurfaceTextureContext::~JNISurfaceTextureContext() env->DeleteGlobalRef(mWeakThiz); env->DeleteGlobalRef(mClazz); } else { - LOGW("leaking JNI object references"); + ALOGW("leaking JNI object references"); } if (needsDetach) { detachJNI(); @@ -150,7 +150,7 @@ void JNISurfaceTextureContext::onFrameAvailable() if (env != NULL) { env->CallStaticVoidMethod(mClazz, fields.postEvent, mWeakThiz); } else { - LOGW("onFrameAvailable event will not posted"); + ALOGW("onFrameAvailable event will not posted"); } if (needsDetach) { detachJNI(); diff --git a/core/jni/android/graphics/TextLayout.cpp b/core/jni/android/graphics/TextLayout.cpp index 1705768..4b0006a 100644 --- a/core/jni/android/graphics/TextLayout.cpp +++ b/core/jni/android/graphics/TextLayout.cpp @@ -228,7 +228,7 @@ bool TextLayout::prepareRtlTextRun(const jchar* context, jsize start, jsize& cou if (U_SUCCESS(status)) { return true; } else { - LOGW("drawTextRun error %d\n", status); + ALOGW("drawTextRun error %d\n", status); } return false; } diff --git a/core/jni/android/graphics/TextLayoutCache.cpp b/core/jni/android/graphics/TextLayoutCache.cpp index 6a81ea2..fdedb24 100644 --- a/core/jni/android/graphics/TextLayoutCache.cpp +++ b/core/jni/android/graphics/TextLayoutCache.cpp @@ -449,7 +449,7 @@ void TextLayoutCacheValue::computeValuesWithHarfbuzz(SkPaint* paint, const UChar isRTL = (paraDir == 1); useSingleRun = true; } else if (!U_SUCCESS(status) || rc < 1) { - LOGW("computeValuesWithHarfbuzz -- need to force to single run"); + ALOGW("computeValuesWithHarfbuzz -- need to force to single run"); isRTL = (paraDir == 1); useSingleRun = true; } else { @@ -462,7 +462,7 @@ void TextLayoutCacheValue::computeValuesWithHarfbuzz(SkPaint* paint, const UChar if (startRun == -1 || lengthRun == -1) { // Something went wrong when getting the visual run, need to clear // already computed data before doing a single run pass - LOGW("computeValuesWithHarfbuzz -- visual run is not valid"); + ALOGW("computeValuesWithHarfbuzz -- visual run is not valid"); outGlyphs->clear(); outAdvances->clear(); *outTotalAdvance = 0; @@ -500,13 +500,13 @@ void TextLayoutCacheValue::computeValuesWithHarfbuzz(SkPaint* paint, const UChar } } } else { - LOGW("computeValuesWithHarfbuzz -- cannot set Para"); + ALOGW("computeValuesWithHarfbuzz -- cannot set Para"); useSingleRun = true; isRTL = (bidiReq = 1) || (bidiReq = UBIDI_DEFAULT_RTL); } ubidi_close(bidi); } else { - LOGW("computeValuesWithHarfbuzz -- cannot ubidi_open()"); + ALOGW("computeValuesWithHarfbuzz -- cannot ubidi_open()"); useSingleRun = true; isRTL = (bidiReq = 1) || (bidiReq = UBIDI_DEFAULT_RTL); } |