Rename (IF_)LOG() to (IF_)ALOG()
Change-Id: If49c81a2793182771c6160fbca93905daa6f44c1
This commit is contained in:
@@ -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
|
||||
}
|
||||
|
||||
@@ -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
|
||||
{
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -31,8 +31,8 @@
|
||||
|
||||
#else
|
||||
|
||||
#define IF_LOG_WINDOW() IF_LOG(LOG_DEBUG, "CursorWindow")
|
||||
#define LOG_WINDOW(...) LOG(LOG_DEBUG, "CursorWindow", __VA_ARGS__)
|
||||
#define IF_LOG_WINDOW() IF_ALOG(LOG_DEBUG, "CursorWindow")
|
||||
#define LOG_WINDOW(...) ALOG(LOG_DEBUG, "CursorWindow", __VA_ARGS__)
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
@@ -56,12 +56,12 @@
|
||||
|
||||
#else
|
||||
|
||||
#define IF_LOG_TRANSACTIONS() IF_LOG(LOG_VERBOSE, "transact")
|
||||
#define IF_LOG_COMMANDS() IF_LOG(LOG_VERBOSE, "ipc")
|
||||
#define LOG_REMOTEREFS(...) LOG(LOG_DEBUG, "remoterefs", __VA_ARGS__)
|
||||
#define IF_LOG_REMOTEREFS() IF_LOG(LOG_DEBUG, "remoterefs")
|
||||
#define LOG_THREADPOOL(...) LOG(LOG_DEBUG, "threadpool", __VA_ARGS__)
|
||||
#define LOG_ONEWAY(...) LOG(LOG_DEBUG, "ipc", __VA_ARGS__)
|
||||
#define IF_LOG_TRANSACTIONS() IF_ALOG(LOG_VERBOSE, "transact")
|
||||
#define IF_LOG_COMMANDS() IF_ALOG(LOG_VERBOSE, "ipc")
|
||||
#define LOG_REMOTEREFS(...) ALOG(LOG_DEBUG, "remoterefs", __VA_ARGS__)
|
||||
#define IF_LOG_REMOTEREFS() IF_ALOG(LOG_DEBUG, "remoterefs")
|
||||
#define LOG_THREADPOOL(...) ALOG(LOG_DEBUG, "threadpool", __VA_ARGS__)
|
||||
#define LOG_ONEWAY(...) ALOG(LOG_DEBUG, "ipc", __VA_ARGS__)
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
@@ -44,7 +44,7 @@
|
||||
#endif
|
||||
|
||||
#define LOG_REFS(...)
|
||||
//#define LOG_REFS(...) LOG(LOG_DEBUG, "Parcel", __VA_ARGS__)
|
||||
//#define LOG_REFS(...) ALOG(LOG_DEBUG, "Parcel", __VA_ARGS__)
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
|
||||
@@ -205,7 +205,7 @@ static __stdcall unsigned int threadIntermediary(void* vDetails)
|
||||
|
||||
delete pDetails;
|
||||
|
||||
LOG(LOG_VERBOSE, "thread", "thread exiting\n");
|
||||
ALOG(LOG_VERBOSE, "thread", "thread exiting\n");
|
||||
return (unsigned int) result;
|
||||
}
|
||||
|
||||
@@ -232,7 +232,7 @@ static bool doCreateThread(android_thread_func_t fn, void* arg, android_thread_i
|
||||
if (hThread == NULL)
|
||||
#endif
|
||||
{
|
||||
LOG(LOG_WARN, "thread", "WARNING: thread create failed\n");
|
||||
ALOG(LOG_WARN, "thread", "WARNING: thread create failed\n");
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -470,7 +470,7 @@ status_t Mutex::lock()
|
||||
void Mutex::unlock()
|
||||
{
|
||||
if (!ReleaseMutex((HANDLE) mState))
|
||||
LOG(LOG_WARN, "thread", "WARNING: bad result from unlocking mutex\n");
|
||||
ALOG(LOG_WARN, "thread", "WARNING: bad result from unlocking mutex\n");
|
||||
}
|
||||
|
||||
status_t Mutex::tryLock()
|
||||
@@ -479,7 +479,7 @@ status_t Mutex::tryLock()
|
||||
|
||||
dwWaitResult = WaitForSingleObject((HANDLE) mState, 0);
|
||||
if (dwWaitResult != WAIT_OBJECT_0 && dwWaitResult != WAIT_TIMEOUT)
|
||||
LOG(LOG_WARN, "thread", "WARNING: bad result from try-locking mutex\n");
|
||||
ALOG(LOG_WARN, "thread", "WARNING: bad result from try-locking mutex\n");
|
||||
return (dwWaitResult == WAIT_OBJECT_0) ? 0 : -1;
|
||||
}
|
||||
|
||||
|
||||
@@ -113,7 +113,7 @@ long long DurationTimer::durationUsecs(void) const
|
||||
/*static*/ void DurationTimer::addToTimeval(struct timeval* ptv, long usec)
|
||||
{
|
||||
if (usec < 0) {
|
||||
LOG(LOG_WARN, "", "Negative values not supported in addToTimeval\n");
|
||||
ALOG(LOG_WARN, "", "Negative values not supported in addToTimeval\n");
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user