diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-01-19 16:59:41 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-01-19 16:59:41 -0800 |
| commit | 36b48c30adf7236b00eccf87f3b5691359526540 (patch) | |
| tree | d1dd7414594b487dc7f81979449d444118c4b1b1 /core | |
| parent | cdc1ea03130763963fe6c179ed1f5ec14d6c7750 (diff) | |
| parent | c318bbb05e02a0080e129623ec8029d31be0d60e (diff) | |
| download | frameworks_base-36b48c30adf7236b00eccf87f3b5691359526540.zip frameworks_base-36b48c30adf7236b00eccf87f3b5691359526540.tar.gz frameworks_base-36b48c30adf7236b00eccf87f3b5691359526540.tar.bz2 | |
am c318bbb0: Merge "Rename (IF_)LOG() to (IF_)ALOG()"
* commit 'c318bbb05e02a0080e129623ec8029d31be0d60e':
Rename (IF_)LOG() to (IF_)ALOG()
Diffstat (limited to 'core')
| -rw-r--r-- | core/jni/android/graphics/TextLayout.cpp | 6 | ||||
| -rw-r--r-- | core/jni/android_app_NativeActivity.cpp | 2 | ||||
| -rw-r--r-- | core/jni/android_bluetooth_HeadsetBase.cpp | 2 | ||||
| -rw-r--r-- | core/jni/android_nfc.h | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/core/jni/android/graphics/TextLayout.cpp b/core/jni/android/graphics/TextLayout.cpp index 9b424f2..e1398e9 100644 --- a/core/jni/android/graphics/TextLayout.cpp +++ b/core/jni/android/graphics/TextLayout.cpp @@ -78,7 +78,7 @@ int TextLayout::shapeRtlText(const jchar* context, jsize start, jsize count, jsi } } count = end; - // LOG(LOG_INFO, "CSRTL", "start %d count %d ccount %d\n", start, count, contextCount); + // ALOG(LOG_INFO, "CSRTL", "start %d count %d ccount %d\n", start, count, contextCount); ubidi_writeReverse(buffer, count, shaped, count, UBIDI_DO_MIRRORING | UBIDI_OUTPUT_REVERSE | UBIDI_KEEP_BASE_COMBINING, &status); if (U_SUCCESS(status)) { @@ -125,7 +125,7 @@ jint TextLayout::layoutLine(const jchar* text, jint len, jint flags, int& dir, j int rc = ubidi_countRuns(bidi, &status); if (U_SUCCESS(status)) { - // LOG(LOG_INFO, "LAYOUT", "para bidiReq=%d dir=%d rc=%d\n", bidiReq, dir, rc); + // ALOG(LOG_INFO, "LAYOUT", "para bidiReq=%d dir=%d rc=%d\n", bidiReq, dir, rc); int32_t slen = 0; for (int i = 0; i < rc; ++i) { @@ -164,7 +164,7 @@ bool TextLayout::prepareText(SkPaint* paint, const jchar* text, jsize len, jint UErrorCode status = U_ZERO_ERROR; len = layoutLine(text, len, bidiFlags, dir, buffer, status); // might change len, dir if (!U_SUCCESS(status)) { - LOG(LOG_WARN, "LAYOUT", "drawText error %d\n", status); + ALOG(LOG_WARN, "LAYOUT", "drawText error %d\n", status); free(buffer); return false; // can't render } diff --git a/core/jni/android_app_NativeActivity.cpp b/core/jni/android_app_NativeActivity.cpp index b1ea90b..c43e7e7 100644 --- a/core/jni/android_app_NativeActivity.cpp +++ b/core/jni/android_app_NativeActivity.cpp @@ -36,7 +36,7 @@ #include "android_view_KeyEvent.h" #define LOG_TRACE(...) -//#define LOG_TRACE(...) LOG(LOG_DEBUG, LOG_TAG, __VA_ARGS__) +//#define LOG_TRACE(...) ALOG(LOG_DEBUG, LOG_TAG, __VA_ARGS__) namespace android { diff --git a/core/jni/android_bluetooth_HeadsetBase.cpp b/core/jni/android_bluetooth_HeadsetBase.cpp index 5b21c56..4de29de 100644 --- a/core/jni/android_bluetooth_HeadsetBase.cpp +++ b/core/jni/android_bluetooth_HeadsetBase.cpp @@ -494,7 +494,7 @@ static void pretty_log_urc(const char *urc) { } } } - IF_LOGV() LOG(LOG_VERBOSE, "Bluetooth AT sent", "%s", buf); + IF_LOGV() ALOG(LOG_VERBOSE, "Bluetooth AT sent", "%s", buf); free(buf); } diff --git a/core/jni/android_nfc.h b/core/jni/android_nfc.h index de0ddde..36346e3 100644 --- a/core/jni/android_nfc.h +++ b/core/jni/android_nfc.h @@ -28,7 +28,7 @@ extern "C" { #if 0 - #define TRACE(...) LOG(LOG_DEBUG, "NdefMessage", __VA_ARGS__) + #define TRACE(...) ALOG(LOG_DEBUG, "NdefMessage", __VA_ARGS__) #else #define TRACE(...) #endif |