From 5baa3a62a97544669fba6d65a11c07f252e654dd Mon Sep 17 00:00:00 2001 From: Steve Block Date: Tue, 20 Dec 2011 16:23:08 +0000 Subject: Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGE See https://android-git.corp.google.com/g/156016 Bug: 5449033 Change-Id: I4c4e33bb9df3e39e11cd985e193e6fbab4635298 --- services/jni/com_android_server_AlarmManagerService.cpp | 2 +- services/jni/com_android_server_InputManager.cpp | 14 +++++++------- services/jni/com_android_server_connectivity_Vpn.cpp | 4 ++-- .../com_android_server_location_GpsLocationProvider.cpp | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) (limited to 'services/jni') diff --git a/services/jni/com_android_server_AlarmManagerService.cpp b/services/jni/com_android_server_AlarmManagerService.cpp index e80dd04..5f189a2 100644 --- a/services/jni/com_android_server_AlarmManagerService.cpp +++ b/services/jni/com_android_server_AlarmManagerService.cpp @@ -49,7 +49,7 @@ static jint android_server_AlarmManagerService_setKernelTimezone(JNIEnv* env, jo LOGE("Unable to set kernel timezone to %d: %s\n", minswest, strerror(errno)); return -1; } else { - LOGD("Kernel timezone updated to %d minutes west of GMT\n", minswest); + ALOGD("Kernel timezone updated to %d minutes west of GMT\n", minswest); } return 0; diff --git a/services/jni/com_android_server_InputManager.cpp b/services/jni/com_android_server_InputManager.cpp index f259883..145f713 100644 --- a/services/jni/com_android_server_InputManager.cpp +++ b/services/jni/com_android_server_InputManager.cpp @@ -502,7 +502,7 @@ void NativeInputManager::ensureSpriteControllerLocked() { void NativeInputManager::notifySwitch(nsecs_t when, int32_t switchCode, int32_t switchValue, uint32_t policyFlags) { #if DEBUG_INPUT_DISPATCHER_POLICY - LOGD("notifySwitch - when=%lld, switchCode=%d, switchValue=%d, policyFlags=0x%x", + ALOGD("notifySwitch - when=%lld, switchCode=%d, switchValue=%d, policyFlags=0x%x", when, switchCode, switchValue, policyFlags); #endif @@ -519,7 +519,7 @@ void NativeInputManager::notifySwitch(nsecs_t when, int32_t switchCode, void NativeInputManager::notifyConfigurationChanged(nsecs_t when) { #if DEBUG_INPUT_DISPATCHER_POLICY - LOGD("notifyConfigurationChanged - when=%lld", when); + ALOGD("notifyConfigurationChanged - when=%lld", when); #endif JNIEnv* env = jniEnv(); @@ -531,7 +531,7 @@ void NativeInputManager::notifyConfigurationChanged(nsecs_t when) { nsecs_t NativeInputManager::notifyANR(const sp& inputApplicationHandle, const sp& inputWindowHandle) { #if DEBUG_INPUT_DISPATCHER_POLICY - LOGD("notifyANR"); + ALOGD("notifyANR"); #endif JNIEnv* env = jniEnv(); @@ -556,7 +556,7 @@ nsecs_t NativeInputManager::notifyANR(const sp& inputApp void NativeInputManager::notifyInputChannelBroken(const sp& inputWindowHandle) { #if DEBUG_INPUT_DISPATCHER_POLICY - LOGD("notifyInputChannelBroken"); + ALOGD("notifyInputChannelBroken"); #endif JNIEnv* env = jniEnv(); @@ -829,14 +829,14 @@ void NativeInputManager::handleInterceptActions(jint wmActions, nsecs_t when, uint32_t& policyFlags) { if (wmActions & WM_ACTION_GO_TO_SLEEP) { #if DEBUG_INPUT_DISPATCHER_POLICY - LOGD("handleInterceptActions: Going to sleep."); + ALOGD("handleInterceptActions: Going to sleep."); #endif android_server_PowerManagerService_goToSleep(when); } if (wmActions & WM_ACTION_POKE_USER_ACTIVITY) { #if DEBUG_INPUT_DISPATCHER_POLICY - LOGD("handleInterceptActions: Poking user activity."); + ALOGD("handleInterceptActions: Poking user activity."); #endif android_server_PowerManagerService_userActivity(when, POWER_MANAGER_BUTTON_EVENT); } @@ -845,7 +845,7 @@ void NativeInputManager::handleInterceptActions(jint wmActions, nsecs_t when, policyFlags |= POLICY_FLAG_PASS_TO_USER; } else { #if DEBUG_INPUT_DISPATCHER_POLICY - LOGD("handleInterceptActions: Not passing key to user."); + ALOGD("handleInterceptActions: Not passing key to user."); #endif } } diff --git a/services/jni/com_android_server_connectivity_Vpn.cpp b/services/jni/com_android_server_connectivity_Vpn.cpp index d28a6b4..d9b8a14 100644 --- a/services/jni/com_android_server_connectivity_Vpn.cpp +++ b/services/jni/com_android_server_connectivity_Vpn.cpp @@ -171,7 +171,7 @@ static int set_addresses(const char *name, const char *addresses) break; } } - LOGD("Address added on %s: %s/%d", name, address, prefix); + ALOGD("Address added on %s: %s/%d", name, address, prefix); ++count; } @@ -260,7 +260,7 @@ static int set_routes(const char *name, const char *routes) } } } - LOGD("Route added on %s: %s/%d", name, address, prefix); + ALOGD("Route added on %s: %s/%d", name, address, prefix); ++count; } diff --git a/services/jni/com_android_server_location_GpsLocationProvider.cpp b/services/jni/com_android_server_location_GpsLocationProvider.cpp index c823da5..2e5b5d6 100755 --- a/services/jni/com_android_server_location_GpsLocationProvider.cpp +++ b/services/jni/com_android_server_location_GpsLocationProvider.cpp @@ -107,7 +107,7 @@ static void nmea_callback(GpsUtcTime timestamp, const char* nmea, int length) static void set_capabilities_callback(uint32_t capabilities) { - LOGD("set_capabilities_callback: %ld\n", capabilities); + ALOGD("set_capabilities_callback: %ld\n", capabilities); JNIEnv* env = AndroidRuntime::getJNIEnv(); env->CallVoidMethod(mCallbacksObj, method_setEngineCapabilities, capabilities); checkAndClearExceptionFromCallback(env, __FUNCTION__); @@ -182,7 +182,7 @@ AGpsCallbacks sAGpsCallbacks = { static void gps_ni_notify_callback(GpsNiNotification *notification) { - LOGD("gps_ni_notify_callback\n"); + ALOGD("gps_ni_notify_callback\n"); JNIEnv* env = AndroidRuntime::getJNIEnv(); jstring requestor_id = env->NewStringUTF(notification->requestor_id); jstring text = env->NewStringUTF(notification->text); -- cgit v1.1