commit 36b077d558727ead246434b08de0ce7b955508e1
author Jeff Brown <jeffbrown@google.com> Wed Mar 09 02:45:59 2011 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Wed Mar 09 02:45:59 2011 -0800
tree fe478c6a72dc8a09f47805cd81a31d8fc08b7c56
parent 12230eaa5f446cb22032d6645074a1aaca146df9
parent b23bdf518bd652224e04a60aca57b34f7631ceec

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

services/jni/com_android_server_InputManager.cpp

diff --git a/services/jni/com_android_server_InputManager.cpp b/services/jni/com_android_server_InputManager.cpp
index 3be3b1b..bd4e787 100644
--- a/services/jni/com_android_server_InputManager.cpp
+++ b/services/jni/com_android_server_InputManager.cpp
@@ -727,14 +727,14 @@
     };
 
     if (wmActions & WM_ACTION_GO_TO_SLEEP) {
-#ifdef DEBUG_INPUT_DISPATCHER_POLICY
+#if DEBUG_INPUT_DISPATCHER_POLICY
         LOGD("handleInterceptActions: Going to sleep.");
 #endif
         android_server_PowerManagerService_goToSleep(when);
     }
 
     if (wmActions & WM_ACTION_POKE_USER_ACTIVITY) {
-#ifdef DEBUG_INPUT_DISPATCHER_POLICY
+#if DEBUG_INPUT_DISPATCHER_POLICY
         LOGD("handleInterceptActions: Poking user activity.");
 #endif
         android_server_PowerManagerService_userActivity(when, POWER_MANAGER_BUTTON_EVENT);
@@ -743,7 +743,7 @@
     if (wmActions & WM_ACTION_PASS_TO_USER) {
         policyFlags |= POLICY_FLAG_PASS_TO_USER;
     } else {
-#ifdef DEBUG_INPUT_DISPATCHER_POLICY
+#if DEBUG_INPUT_DISPATCHER_POLICY
         LOGD("handleInterceptActions: Not passing key to user.");
 #endif
     }