diff options
author | Steve Block <steveblock@google.com> | 2012-01-05 23:22:43 +0000 |
---|---|---|
committer | Steve Block <steveblock@google.com> | 2012-01-06 10:07:54 +0000 |
commit | 8564c8da817a845353d213acd8636b76f567b234 (patch) | |
tree | 71acbd8ace822c769aef917629bf5a079f63274d /core | |
parent | c42e6a0bed2c88fd03466c5104d62d7f98e68768 (diff) | |
download | frameworks_base-8564c8da817a845353d213acd8636b76f567b234.zip frameworks_base-8564c8da817a845353d213acd8636b76f567b234.tar.gz frameworks_base-8564c8da817a845353d213acd8636b76f567b234.tar.bz2 |
Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGE
See https://android-git.corp.google.com/g/157065
Bug: 5449033
Change-Id: I00a4b904f9449e6f93b7fd35eac28640d7929e69
Diffstat (limited to 'core')
-rw-r--r-- | core/jni/AndroidRuntime.cpp | 6 | ||||
-rw-r--r-- | core/jni/android/graphics/SurfaceTexture.cpp | 4 | ||||
-rw-r--r-- | core/jni/android/graphics/TextLayoutCache.cpp | 8 | ||||
-rw-r--r-- | core/jni/android_app_NativeActivity.cpp | 34 | ||||
-rw-r--r-- | core/jni/android_backup_BackupHelperDispatcher.cpp | 10 | ||||
-rw-r--r-- | core/jni/android_bluetooth_HeadsetBase.cpp | 2 | ||||
-rw-r--r-- | core/jni/android_database_SQLiteDatabase.cpp | 2 | ||||
-rw-r--r-- | core/jni/android_hardware_Camera.cpp | 4 | ||||
-rw-r--r-- | core/jni/android_os_Debug.cpp | 4 | ||||
-rw-r--r-- | core/jni/android_server_BluetoothEventLoop.cpp | 4 | ||||
-rw-r--r-- | core/jni/android_util_Binder.cpp | 16 | ||||
-rw-r--r-- | core/jni/android_util_Process.cpp | 12 | ||||
-rw-r--r-- | core/jni/android_view_DisplayEventReceiver.cpp | 8 | ||||
-rw-r--r-- | core/jni/android_view_InputChannel.cpp | 4 | ||||
-rw-r--r-- | core/jni/android_view_InputEventReceiver.cpp | 14 | ||||
-rw-r--r-- | core/jni/android_view_KeyEvent.cpp | 2 | ||||
-rw-r--r-- | core/jni/android_view_MotionEvent.cpp | 2 | ||||
-rw-r--r-- | core/jni/android_view_PointerIcon.cpp | 4 | ||||
-rw-r--r-- | core/jni/android_view_VelocityTracker.cpp | 2 |
19 files changed, 71 insertions, 71 deletions
diff --git a/core/jni/AndroidRuntime.cpp b/core/jni/AndroidRuntime.cpp index 274121a..57f4b95 100644 --- a/core/jni/AndroidRuntime.cpp +++ b/core/jni/AndroidRuntime.cpp @@ -396,7 +396,7 @@ static void blockSigpipe() sigemptyset(&mask); sigaddset(&mask, SIGPIPE); if (sigprocmask(SIG_BLOCK, &mask, NULL) != 0) - LOGW("WARNING: SIGPIPE not blocked\n"); + ALOGW("WARNING: SIGPIPE not blocked\n"); } /* @@ -889,9 +889,9 @@ void AndroidRuntime::start(const char* className, const char* options) ALOGD("Shutting down VM\n"); if (mJavaVM->DetachCurrentThread() != JNI_OK) - LOGW("Warning: unable to detach main thread\n"); + ALOGW("Warning: unable to detach main thread\n"); if (mJavaVM->DestroyJavaVM() != 0) - LOGW("Warning: VM did not shut down cleanly\n"); + ALOGW("Warning: VM did not shut down cleanly\n"); } void AndroidRuntime::onExit(int code) 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/TextLayoutCache.cpp b/core/jni/android/graphics/TextLayoutCache.cpp index 75251c9..1b7623d 100644 --- a/core/jni/android/graphics/TextLayoutCache.cpp +++ b/core/jni/android/graphics/TextLayoutCache.cpp @@ -423,7 +423,7 @@ void TextLayoutEngine::computeValues(SkPaint* paint, const UChar* chars, isRTL = (paraDir == 1); useSingleRun = true; } else if (!U_SUCCESS(status) || rc < 1) { - LOGW("Need to force to single run -- string = '%s'," + ALOGW("Need to force to single run -- string = '%s'," " status = %d, rc = %d", String8(chars + start, count).string(), status, int(rc)); isRTL = (paraDir == 1); @@ -438,7 +438,7 @@ void TextLayoutEngine::computeValues(SkPaint* paint, const UChar* chars, 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("Visual run is not valid"); + ALOGW("Visual run is not valid"); outGlyphs->clear(); outAdvances->clear(); *outTotalAdvance = 0; @@ -475,13 +475,13 @@ void TextLayoutEngine::computeValues(SkPaint* paint, const UChar* chars, } } } else { - LOGW("Cannot set Para"); + ALOGW("Cannot set Para"); useSingleRun = true; isRTL = (bidiReq = 1) || (bidiReq = UBIDI_DEFAULT_RTL); } ubidi_close(bidi); } else { - LOGW("Cannot ubidi_open()"); + ALOGW("Cannot ubidi_open()"); useSingleRun = true; isRTL = (bidiReq = 1) || (bidiReq = UBIDI_DEFAULT_RTL); } diff --git a/core/jni/android_app_NativeActivity.cpp b/core/jni/android_app_NativeActivity.cpp index 15bb543..7f5ba85 100644 --- a/core/jni/android_app_NativeActivity.cpp +++ b/core/jni/android_app_NativeActivity.cpp @@ -84,8 +84,8 @@ restart: if (res == sizeof(work)) return; - if (res < 0) LOGW("Failed writing to work fd: %s", strerror(errno)); - else LOGW("Truncated writing to work fd: %d", res); + if (res < 0) ALOGW("Failed writing to work fd: %s", strerror(errno)); + else ALOGW("Truncated writing to work fd: %d", res); } static bool read_work(int fd, ActivityWork* outWork) { @@ -93,8 +93,8 @@ static bool read_work(int fd, ActivityWork* outWork) { // no need to worry about EINTR, poll loop will just come back again. if (res == sizeof(ActivityWork)) return true; - if (res < 0) LOGW("Failed reading work fd: %s", strerror(errno)); - else LOGW("Truncated reading work fd: %d", res); + if (res < 0) ALOGW("Failed reading work fd: %s", strerror(errno)); + else ALOGW("Truncated reading work fd: %d", res); return false; } @@ -108,7 +108,7 @@ AInputQueue::AInputQueue(const sp<InputChannel>& channel, int workWrite) : mWorkWrite(workWrite), mConsumer(channel), mSeq(0) { int msgpipe[2]; if (pipe(msgpipe)) { - LOGW("could not create pipe: %s", strerror(errno)); + ALOGW("could not create pipe: %s", strerror(errno)); mDispatchKeyRead = mDispatchKeyWrite = -1; } else { mDispatchKeyRead = msgpipe[0]; @@ -187,7 +187,7 @@ int32_t AInputQueue::getEvent(AInputEvent** outEvent) { } } if (*outEvent == NULL) { - LOGW("getEvent couldn't find inflight for seq %d", finish.seq); + ALOGW("getEvent couldn't find inflight for seq %d", finish.seq); } } mLock.unlock(); @@ -211,7 +211,7 @@ int32_t AInputQueue::getEvent(AInputEvent** outEvent) { InputEvent* myEvent = NULL; res = mConsumer.consume(this, &myEvent); if (res != android::OK) { - LOGW("channel '%s' ~ Failed to consume input event. status=%d", + ALOGW("channel '%s' ~ Failed to consume input event. status=%d", mConsumer.getChannel()->getName().string(), res); mConsumer.sendFinishedSignal(false); return -1; @@ -265,7 +265,7 @@ void AInputQueue::finishEvent(AInputEvent* event, bool handled, bool didDefaultH if (inflight.doFinish) { int32_t res = mConsumer.sendFinishedSignal(handled); if (res != android::OK) { - LOGW("Failed to send finished signal on channel '%s'. status=%d", + ALOGW("Failed to send finished signal on channel '%s'. status=%d", mConsumer.getChannel()->getName().string(), res); } } @@ -281,7 +281,7 @@ void AInputQueue::finishEvent(AInputEvent* event, bool handled, bool didDefaultH } mLock.unlock(); - LOGW("finishEvent called for unknown event: %p", event); + ALOGW("finishEvent called for unknown event: %p", event); } void AInputQueue::dispatchEvent(android::KeyEvent* event) { @@ -398,7 +398,7 @@ bool AInputQueue::preDispatchKey(KeyEvent* keyEvent) { } } - LOGW("preDispatchKey called for unknown event: %p", keyEvent); + ALOGW("preDispatchKey called for unknown event: %p", keyEvent); return false; } @@ -412,8 +412,8 @@ restart: if (res == sizeof(dummy)) return; - if (res < 0) LOGW("Failed writing to dispatch fd: %s", strerror(errno)); - else LOGW("Truncated writing to dispatch fd: %d", res); + if (res < 0) ALOGW("Failed writing to dispatch fd: %s", strerror(errno)); + else ALOGW("Truncated writing to dispatch fd: %d", res); } namespace android { @@ -629,7 +629,7 @@ static int mainWorkCallback(int fd, int events, void* data) { checkAndClearExceptionFromCallback(code->env, "hideIme"); } break; default: - LOGW("Unknown work command: %d", work.cmd); + ALOGW("Unknown work command: %d", work.cmd); break; } @@ -660,21 +660,21 @@ loadNativeCode_native(JNIEnv* env, jobject clazz, jstring path, jstring funcName env->ReleaseStringUTFChars(funcName, funcStr); if (code->createActivityFunc == NULL) { - LOGW("ANativeActivity_onCreate not found"); + ALOGW("ANativeActivity_onCreate not found"); delete code; return 0; } code->looper = android_os_MessageQueue_getLooper(env, messageQueue); if (code->looper == NULL) { - LOGW("Unable to retrieve MessageQueue's Looper"); + ALOGW("Unable to retrieve MessageQueue's Looper"); delete code; return 0; } int msgpipe[2]; if (pipe(msgpipe)) { - LOGW("could not create pipe: %s", strerror(errno)); + ALOGW("could not create pipe: %s", strerror(errno)); delete code; return 0; } @@ -690,7 +690,7 @@ loadNativeCode_native(JNIEnv* env, jobject clazz, jstring path, jstring funcName code->ANativeActivity::callbacks = &code->callbacks; if (env->GetJavaVM(&code->vm) < 0) { - LOGW("NativeActivity GetJavaVM failed"); + ALOGW("NativeActivity GetJavaVM failed"); delete code; return 0; } diff --git a/core/jni/android_backup_BackupHelperDispatcher.cpp b/core/jni/android_backup_BackupHelperDispatcher.cpp index 1f188ff..3e36677 100644 --- a/core/jni/android_backup_BackupHelperDispatcher.cpp +++ b/core/jni/android_backup_BackupHelperDispatcher.cpp @@ -58,7 +58,7 @@ readHeader_native(JNIEnv* env, jobject clazz, jobject headerObj, jobject fdObj) int remainingHeader = flattenedHeader.headerSize - sizeof(flattenedHeader.headerSize); if (flattenedHeader.headerSize < (int)sizeof(chunk_header_v1)) { - LOGW("Skipping unknown header: %d bytes", flattenedHeader.headerSize); + ALOGW("Skipping unknown header: %d bytes", flattenedHeader.headerSize); if (remainingHeader > 0) { lseek(fd, remainingHeader, SEEK_CUR); // >0 means skip this chunk @@ -69,13 +69,13 @@ readHeader_native(JNIEnv* env, jobject clazz, jobject headerObj, jobject fdObj) amt = read(fd, &flattenedHeader.version, sizeof(chunk_header_v1)-sizeof(flattenedHeader.headerSize)); if (amt <= 0) { - LOGW("Failed reading chunk header"); + ALOGW("Failed reading chunk header"); return -1; } remainingHeader -= sizeof(chunk_header_v1)-sizeof(flattenedHeader.headerSize); if (flattenedHeader.version != VERSION_1_HEADER) { - LOGW("Skipping unknown header version: 0x%08x, %d bytes", flattenedHeader.version, + ALOGW("Skipping unknown header version: 0x%08x, %d bytes", flattenedHeader.version, flattenedHeader.headerSize); if (remainingHeader > 0) { lseek(fd, remainingHeader, SEEK_CUR); @@ -94,14 +94,14 @@ readHeader_native(JNIEnv* env, jobject clazz, jobject headerObj, jobject fdObj) if (flattenedHeader.dataSize < 0 || flattenedHeader.nameLength < 0 || remainingHeader < flattenedHeader.nameLength) { - LOGW("Malformed V1 header remainingHeader=%d dataSize=%d nameLength=%d", remainingHeader, + ALOGW("Malformed V1 header remainingHeader=%d dataSize=%d nameLength=%d", remainingHeader, flattenedHeader.dataSize, flattenedHeader.nameLength); return -1; } buf = keyPrefix.lockBuffer(flattenedHeader.nameLength); if (buf == NULL) { - LOGW("unable to allocate %d bytes", flattenedHeader.nameLength); + ALOGW("unable to allocate %d bytes", flattenedHeader.nameLength); return -1; } diff --git a/core/jni/android_bluetooth_HeadsetBase.cpp b/core/jni/android_bluetooth_HeadsetBase.cpp index 8dd3116..1f59937 100644 --- a/core/jni/android_bluetooth_HeadsetBase.cpp +++ b/core/jni/android_bluetooth_HeadsetBase.cpp @@ -126,7 +126,7 @@ again: } if (pfd.revents & (POLLHUP | POLLERR | POLLNVAL)) { - LOGW("RFCOMM poll() returned success (%d), " + ALOGW("RFCOMM poll() returned success (%d), " "but with an unexpected revents bitmask: %#x\n", ret, pfd.revents); errno = EIO; *err = errno; diff --git a/core/jni/android_database_SQLiteDatabase.cpp b/core/jni/android_database_SQLiteDatabase.cpp index cf4cbb8..d5a034a 100644 --- a/core/jni/android_database_SQLiteDatabase.cpp +++ b/core/jni/android_database_SQLiteDatabase.cpp @@ -92,7 +92,7 @@ static void registerLoggingFunc(const char *path) { ALOGV("Registering sqlite logging func \n"); int err = sqlite3_config(SQLITE_CONFIG_LOG, &sqlLogger, (void *)createStr(path, 0)); if (err != SQLITE_OK) { - LOGW("sqlite returned error = %d when trying to register logging func.\n", err); + ALOGW("sqlite returned error = %d when trying to register logging func.\n", err); return; } loggingFuncSet = true; diff --git a/core/jni/android_hardware_Camera.cpp b/core/jni/android_hardware_Camera.cpp index 953da79..e192ec6 100644 --- a/core/jni/android_hardware_Camera.cpp +++ b/core/jni/android_hardware_Camera.cpp @@ -173,7 +173,7 @@ void JNICameraContext::notify(int32_t msgType, int32_t ext1, int32_t ext2) // VM pointer will be NULL if object is released Mutex::Autolock _l(mLock); if (mCameraJObjectWeak == NULL) { - LOGW("callback on dead camera object"); + ALOGW("callback on dead camera object"); return; } JNIEnv *env = AndroidRuntime::getJNIEnv(); @@ -279,7 +279,7 @@ void JNICameraContext::postData(int32_t msgType, const sp<IMemory>& dataPtr, Mutex::Autolock _l(mLock); JNIEnv *env = AndroidRuntime::getJNIEnv(); if (mCameraJObjectWeak == NULL) { - LOGW("callback on dead camera object"); + ALOGW("callback on dead camera object"); return; } diff --git a/core/jni/android_os_Debug.cpp b/core/jni/android_os_Debug.cpp index d9908ce..9586717 100644 --- a/core/jni/android_os_Debug.cpp +++ b/core/jni/android_os_Debug.cpp @@ -517,14 +517,14 @@ static void android_os_Debug_dumpNativeHeap(JNIEnv* env, jobject clazz, /* dup() the descriptor so we don't close the original with fclose() */ int fd = dup(origFd); if (fd < 0) { - LOGW("dup(%d) failed: %s\n", origFd, strerror(errno)); + ALOGW("dup(%d) failed: %s\n", origFd, strerror(errno)); jniThrowRuntimeException(env, "dup() failed"); return; } FILE* fp = fdopen(fd, "w"); if (fp == NULL) { - LOGW("fdopen(%d) failed: %s\n", fd, strerror(errno)); + ALOGW("fdopen(%d) failed: %s\n", fd, strerror(errno)); close(fd); jniThrowRuntimeException(env, "fdopen() failed"); return; diff --git a/core/jni/android_server_BluetoothEventLoop.cpp b/core/jni/android_server_BluetoothEventLoop.cpp index d146e27..1924dbf 100644 --- a/core/jni/android_server_BluetoothEventLoop.cpp +++ b/core/jni/android_server_BluetoothEventLoop.cpp @@ -629,7 +629,7 @@ static void handleWatchRemove(native_data_t *nat) { return; } } - LOGW("WatchRemove given with unknown watch"); + ALOGW("WatchRemove given with unknown watch"); } static void *eventLoopMain(void *ptr) { @@ -717,7 +717,7 @@ static jboolean startEventLoopNative(JNIEnv *env, jobject object) { nat->running = false; if (nat->pollData) { - LOGW("trying to start EventLoop a second time!"); + ALOGW("trying to start EventLoop a second time!"); pthread_mutex_unlock( &(nat->thread_mutex) ); return JNI_FALSE; } diff --git a/core/jni/android_util_Binder.cpp b/core/jni/android_util_Binder.cpp index b2ecf62..4d6bfbc 100644 --- a/core/jni/android_util_Binder.cpp +++ b/core/jni/android_util_Binder.cpp @@ -203,7 +203,7 @@ static void report_exception(JNIEnv* env, jthrowable excep, const char* msg) gLogOffsets.mClass, gLogOffsets.mLogE, tagstr, msgstr, excep); if (env->ExceptionCheck()) { /* attempting to log the failure has failed */ - LOGW("Failed trying to log exception, msg='%s'\n", msg); + ALOGW("Failed trying to log exception, msg='%s'\n", msg); env->ExceptionClear(); } @@ -463,11 +463,11 @@ public: (jstring) env->CallObjectMethod(objClassRef.get(), gClassOffsets.mGetName)); ScopedUtfChars nameUtf(env, nameRef.get()); if (nameUtf.c_str() != NULL) { - LOGW("BinderProxy is being destroyed but the application did not call " + ALOGW("BinderProxy is being destroyed but the application did not call " "unlinkToDeath to unlink all of its death recipients beforehand. " "Releasing leaked death recipient: %s", nameUtf.c_str()); } else { - LOGW("BinderProxy being destroyed; unable to get DR object name"); + ALOGW("BinderProxy being destroyed; unable to get DR object name"); env->ExceptionClear(); } } @@ -630,7 +630,7 @@ sp<IBinder> ibinderForJavaObject(JNIEnv* env, jobject obj) env->GetIntField(obj, gBinderProxyOffsets.mObject); } - LOGW("ibinderForJavaObject: %p is not a Binder object", obj); + ALOGW("ibinderForJavaObject: %p is not a Binder object", obj); return NULL; } @@ -976,7 +976,7 @@ static bool push_eventlog_string(char** pos, const char* end, const char* str) { jint len = strlen(str); int space_needed = 1 + sizeof(len) + len; if (end - *pos < space_needed) { - LOGW("not enough space for string. remain=%d; needed=%d", + ALOGW("not enough space for string. remain=%d; needed=%d", (end - *pos), space_needed); return false; } @@ -992,7 +992,7 @@ static bool push_eventlog_string(char** pos, const char* end, const char* str) { static bool push_eventlog_int(char** pos, const char* end, jint val) { int space_needed = 1 + sizeof(val); if (end - *pos < space_needed) { - LOGW("not enough space for int. remain=%d; needed=%d", + ALOGW("not enough space for int. remain=%d; needed=%d", (end - *pos), space_needed); return false; } @@ -1117,7 +1117,7 @@ static void android_os_BinderProxy_linkToDeath(JNIEnv* env, jobject obj, IBinder* target = (IBinder*) env->GetIntField(obj, gBinderProxyOffsets.mObject); if (target == NULL) { - LOGW("Binder has been finalized when calling linkToDeath() with recip=%p)\n", recipient); + ALOGW("Binder has been finalized when calling linkToDeath() with recip=%p)\n", recipient); assert(false); } @@ -1149,7 +1149,7 @@ static jboolean android_os_BinderProxy_unlinkToDeath(JNIEnv* env, jobject obj, IBinder* target = (IBinder*) env->GetIntField(obj, gBinderProxyOffsets.mObject); if (target == NULL) { - LOGW("Binder has been finalized when calling linkToDeath() with recip=%p)\n", recipient); + ALOGW("Binder has been finalized when calling linkToDeath() with recip=%p)\n", recipient); return JNI_FALSE; } diff --git a/core/jni/android_util_Process.cpp b/core/jni/android_util_Process.cpp index 8660668..9245d99 100644 --- a/core/jni/android_util_Process.cpp +++ b/core/jni/android_util_Process.cpp @@ -371,7 +371,7 @@ static jlong android_os_Process_getFreeMemory(JNIEnv* env, jobject clazz) int fd = open("/proc/meminfo", O_RDONLY); if (fd < 0) { - LOGW("Unable to open /proc/meminfo"); + ALOGW("Unable to open /proc/meminfo"); return -1; } @@ -380,7 +380,7 @@ static jlong android_os_Process_getFreeMemory(JNIEnv* env, jobject clazz) close(fd); if (len < 0) { - LOGW("Unable to read /proc/meminfo"); + ALOGW("Unable to read /proc/meminfo"); return -1; } buffer[len] = 0; @@ -479,7 +479,7 @@ void android_os_Process_readProcLines(JNIEnv* env, jobject clazz, jstring fileSt close(fd); if (len < 0) { - LOGW("Unable to read %s", file.string()); + ALOGW("Unable to read %s", file.string()); len = 0; } buffer[len] = 0; @@ -521,7 +521,7 @@ void android_os_Process_readProcLines(JNIEnv* env, jobject clazz, jstring fileSt free(buffer); } else { - LOGW("Unable to open %s", file.string()); + ALOGW("Unable to open %s", file.string()); } //ALOGI("Done!"); @@ -759,7 +759,7 @@ jboolean android_os_Process_readProcFile(JNIEnv* env, jobject clazz, env->ReleaseStringUTFChars(file, file8); if (fd < 0) { - //LOGW("Unable to open process file: %s\n", file8); + //ALOGW("Unable to open process file: %s\n", file8); return JNI_FALSE; } @@ -768,7 +768,7 @@ jboolean android_os_Process_readProcFile(JNIEnv* env, jobject clazz, close(fd); if (len < 0) { - //LOGW("Unable to open process file: %s fd=%d\n", file8, fd); + //ALOGW("Unable to open process file: %s fd=%d\n", file8, fd); return JNI_FALSE; } buffer[len] = 0; diff --git a/core/jni/android_view_DisplayEventReceiver.cpp b/core/jni/android_view_DisplayEventReceiver.cpp index f61795d..aff4b29 100644 --- a/core/jni/android_view_DisplayEventReceiver.cpp +++ b/core/jni/android_view_DisplayEventReceiver.cpp @@ -84,7 +84,7 @@ NativeDisplayEventReceiver::~NativeDisplayEventReceiver() { status_t NativeDisplayEventReceiver::initialize() { status_t result = mReceiver.initCheck(); if (result) { - LOGW("Failed to initialize display event receiver, status=%d", result); + ALOGW("Failed to initialize display event receiver, status=%d", result); return result; } @@ -103,13 +103,13 @@ status_t NativeDisplayEventReceiver::scheduleVsync() { } if (n < 0) { - LOGW("Failed to drain events from display event receiver, status=%d", status_t(n)); + ALOGW("Failed to drain events from display event receiver, status=%d", status_t(n)); return status_t(n); } status_t status = mReceiver.requestNextVsync(); if (status) { - LOGW("Failed to request next vsync, status=%d", status); + ALOGW("Failed to request next vsync, status=%d", status); return status; } @@ -138,7 +138,7 @@ int NativeDisplayEventReceiver::handleReceiveCallback(int receiveFd, int events, } if (!(events & ALOOPER_EVENT_INPUT)) { - LOGW("Received spurious callback for unhandled poll event. " + ALOGW("Received spurious callback for unhandled poll event. " "events=0x%x", events); return 1; // keep the callback } diff --git a/core/jni/android_view_InputChannel.cpp b/core/jni/android_view_InputChannel.cpp index 5fcf8fa..e0976a1 100644 --- a/core/jni/android_view_InputChannel.cpp +++ b/core/jni/android_view_InputChannel.cpp @@ -101,7 +101,7 @@ void android_view_InputChannel_setDisposeCallback(JNIEnv* env, jobject inputChan NativeInputChannel* nativeInputChannel = android_view_InputChannel_getNativeInputChannel(env, inputChannelObj); if (nativeInputChannel == NULL) { - LOGW("Cannot set dispose callback because input channel object has not been initialized."); + ALOGW("Cannot set dispose callback because input channel object has not been initialized."); } else { nativeInputChannel->setDisposeCallback(callback, data); } @@ -161,7 +161,7 @@ static void android_view_InputChannel_nativeDispose(JNIEnv* env, jobject obj, jb android_view_InputChannel_getNativeInputChannel(env, obj); if (nativeInputChannel) { if (finalized) { - LOGW("Input channel object '%s' was finalized without being disposed!", + ALOGW("Input channel object '%s' was finalized without being disposed!", nativeInputChannel->getInputChannel()->getName().string()); } diff --git a/core/jni/android_view_InputEventReceiver.cpp b/core/jni/android_view_InputEventReceiver.cpp index c8f1f51..c77404d 100644 --- a/core/jni/android_view_InputEventReceiver.cpp +++ b/core/jni/android_view_InputEventReceiver.cpp @@ -95,7 +95,7 @@ NativeInputEventReceiver::~NativeInputEventReceiver() { status_t NativeInputEventReceiver::initialize() { status_t result = mInputConsumer.initialize(); if (result) { - LOGW("Failed to initialize input consumer for input channel '%s', status=%d", + ALOGW("Failed to initialize input consumer for input channel '%s', status=%d", getInputChannelName(), result); return result; } @@ -114,12 +114,12 @@ status_t NativeInputEventReceiver::finishInputEvent(bool handled) { status_t status = mInputConsumer.sendFinishedSignal(handled); if (status) { - LOGW("Failed to send finished signal on channel '%s'. status=%d", + ALOGW("Failed to send finished signal on channel '%s'. status=%d", getInputChannelName(), status); } return status; } else { - LOGW("Ignoring attempt to finish input event while no event is in progress."); + ALOGW("Ignoring attempt to finish input event while no event is in progress."); return OK; } } @@ -134,7 +134,7 @@ int NativeInputEventReceiver::handleReceiveCallback(int receiveFd, int events, v } if (!(events & ALOOPER_EVENT_INPUT)) { - LOGW("channel '%s' ~ Received spurious callback for unhandled poll event. " + ALOGW("channel '%s' ~ Received spurious callback for unhandled poll event. " "events=0x%x", r->getInputChannelName(), events); return 1; } @@ -147,7 +147,7 @@ int NativeInputEventReceiver::handleReceiveCallback(int receiveFd, int events, v } if (r->mEventInProgress) { - LOGW("channel '%s' ~ Publisher sent spurious dispatch signal.", + ALOGW("channel '%s' ~ Publisher sent spurious dispatch signal.", r->getInputChannelName()); return 1; } @@ -155,7 +155,7 @@ int NativeInputEventReceiver::handleReceiveCallback(int receiveFd, int events, v InputEvent* inputEvent; status = r->mInputConsumer.consume(&r->mInputEventFactory, &inputEvent); if (status) { - LOGW("channel '%s' ~ Failed to consume input event. status=%d", + ALOGW("channel '%s' ~ Failed to consume input event. status=%d", r->getInputChannelName(), status); r->mInputConsumer.sendFinishedSignal(false); return 1; @@ -188,7 +188,7 @@ int NativeInputEventReceiver::handleReceiveCallback(int receiveFd, int events, v } if (!inputEventObj) { - LOGW("channel '%s' ~ Failed to obtain event object.", + ALOGW("channel '%s' ~ Failed to obtain event object.", r->getInputChannelName()); r->mInputConsumer.sendFinishedSignal(false); return 1; diff --git a/core/jni/android_view_KeyEvent.cpp b/core/jni/android_view_KeyEvent.cpp index 4b04b8b..78951aa 100644 --- a/core/jni/android_view_KeyEvent.cpp +++ b/core/jni/android_view_KeyEvent.cpp @@ -93,7 +93,7 @@ status_t android_view_KeyEvent_toNative(JNIEnv* env, jobject eventObj, status_t android_view_KeyEvent_recycle(JNIEnv* env, jobject eventObj) { env->CallVoidMethod(eventObj, gKeyEventClassInfo.recycle); if (env->ExceptionCheck()) { - LOGW("An exception occurred while recycling a key event."); + ALOGW("An exception occurred while recycling a key event."); LOGW_EX(env); env->ExceptionClear(); return UNKNOWN_ERROR; diff --git a/core/jni/android_view_MotionEvent.cpp b/core/jni/android_view_MotionEvent.cpp index fef06b2..fccc66e 100644 --- a/core/jni/android_view_MotionEvent.cpp +++ b/core/jni/android_view_MotionEvent.cpp @@ -99,7 +99,7 @@ jobject android_view_MotionEvent_obtainAsCopy(JNIEnv* env, const MotionEvent* ev status_t android_view_MotionEvent_recycle(JNIEnv* env, jobject eventObj) { env->CallVoidMethod(eventObj, gMotionEventClassInfo.recycle); if (env->ExceptionCheck()) { - LOGW("An exception occurred while recycling a motion event."); + ALOGW("An exception occurred while recycling a motion event."); LOGW_EX(env); env->ExceptionClear(); return UNKNOWN_ERROR; diff --git a/core/jni/android_view_PointerIcon.cpp b/core/jni/android_view_PointerIcon.cpp index 091341a..8b6dc60 100644 --- a/core/jni/android_view_PointerIcon.cpp +++ b/core/jni/android_view_PointerIcon.cpp @@ -43,7 +43,7 @@ jobject android_view_PointerIcon_getSystemIcon(JNIEnv* env, jobject contextObj, jobject pointerIconObj = env->CallStaticObjectMethod(gPointerIconClassInfo.clazz, gPointerIconClassInfo.getSystemIcon, contextObj, style); if (env->ExceptionCheck()) { - LOGW("An exception occurred while getting a pointer icon with style %d.", style); + ALOGW("An exception occurred while getting a pointer icon with style %d.", style); LOGW_EX(env); env->ExceptionClear(); return NULL; @@ -62,7 +62,7 @@ status_t android_view_PointerIcon_load(JNIEnv* env, jobject pointerIconObj, jobj jobject loadedPointerIconObj = env->CallObjectMethod(pointerIconObj, gPointerIconClassInfo.load, contextObj); if (env->ExceptionCheck() || !loadedPointerIconObj) { - LOGW("An exception occurred while loading a pointer icon."); + ALOGW("An exception occurred while loading a pointer icon."); LOGW_EX(env); env->ExceptionClear(); return UNKNOWN_ERROR; diff --git a/core/jni/android_view_VelocityTracker.cpp b/core/jni/android_view_VelocityTracker.cpp index 516e421..0da90d7 100644 --- a/core/jni/android_view_VelocityTracker.cpp +++ b/core/jni/android_view_VelocityTracker.cpp @@ -154,7 +154,7 @@ static void android_view_VelocityTracker_nativeAddMovement(JNIEnv* env, jclass c jobject eventObj) { const MotionEvent* event = android_view_MotionEvent_getNativePtr(env, eventObj); if (!event) { - LOGW("nativeAddMovement failed because MotionEvent was finalized."); + ALOGW("nativeAddMovement failed because MotionEvent was finalized."); return; } |