drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Eliminate some accidental log spam. (DO NOT MERGE)" into honeycomb-mr1

Browse Source
This commit is contained in:
Jeff Brown
2011-03-09 02:45:59 -08:00
committed by Android (Google) Code Review
parent 12230eaa5f b23bdf518b
commit 36b077d558
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/jni/com_android_server_InputManager.cpp
View File

@ -727,14 +727,14 @@ void NativeInputManager::handleInterceptActions(jint wmActions, nsecs_t when,
}; };
if (wmActions & WM_ACTION_GO_TO_SLEEP) { if (wmActions & WM_ACTION_GO_TO_SLEEP) {
#ifdef DEBUG_INPUT_DISPATCHER_POLICY #if DEBUG_INPUT_DISPATCHER_POLICY
LOGD("handleInterceptActions: Going to sleep."); LOGD("handleInterceptActions: Going to sleep.");
#endif #endif
android_server_PowerManagerService_goToSleep(when); android_server_PowerManagerService_goToSleep(when);
} }
if (wmActions & WM_ACTION_POKE_USER_ACTIVITY) { if (wmActions & WM_ACTION_POKE_USER_ACTIVITY) {
#ifdef DEBUG_INPUT_DISPATCHER_POLICY #if DEBUG_INPUT_DISPATCHER_POLICY
LOGD("handleInterceptActions: Poking user activity."); LOGD("handleInterceptActions: Poking user activity.");
#endif #endif
android_server_PowerManagerService_userActivity(when, POWER_MANAGER_BUTTON_EVENT); android_server_PowerManagerService_userActivity(when, POWER_MANAGER_BUTTON_EVENT);
@ -743,7 +743,7 @@ void NativeInputManager::handleInterceptActions(jint wmActions, nsecs_t when,
if (wmActions & WM_ACTION_PASS_TO_USER) { if (wmActions & WM_ACTION_PASS_TO_USER) {
policyFlags |= POLICY_FLAG_PASS_TO_USER; policyFlags |= POLICY_FLAG_PASS_TO_USER;
} else { } else {
#ifdef DEBUG_INPUT_DISPATCHER_POLICY #if DEBUG_INPUT_DISPATCHER_POLICY
LOGD("handleInterceptActions: Not passing key to user."); LOGD("handleInterceptActions: Not passing key to user.");
#endif #endif
} }