summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorSteve Block <steveblock@google.com>2011-10-12 17:27:03 +0100
committerSteve Block <steveblock@google.com>2012-01-18 11:08:20 +0000
commitad3f5145fe513c4abb36388ab41508edf2be2a7c (patch)
treeb5f25e5fd304344492803dace330f682287a5aa6 /core
parentb4cee0f871e0f5a2abd6c6f05b65710b69423f2c (diff)
downloadframeworks_base-ad3f5145fe513c4abb36388ab41508edf2be2a7c.zip
frameworks_base-ad3f5145fe513c4abb36388ab41508edf2be2a7c.tar.gz
frameworks_base-ad3f5145fe513c4abb36388ab41508edf2be2a7c.tar.bz2
Rename (IF_)LOG() to (IF_)ALOG()
Change-Id: If49c81a2793182771c6160fbca93905daa6f44c1
Diffstat (limited to 'core')
-rw-r--r--core/jni/android/graphics/TextLayout.cpp6
-rw-r--r--core/jni/android_app_NativeActivity.cpp2
-rw-r--r--core/jni/android_bluetooth_HeadsetBase.cpp2
-rw-r--r--core/jni/android_nfc.h2
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