am 41aabeb5: am 1e6a3a53: Merge "Added more robust tracking and cancelation of events." into gingerbread

Merge commit '41aabeb51305d19747687f246080f44fc2a74435'

* commit '41aabeb51305d19747687f246080f44fc2a74435':
  Added more robust tracking and cancelation of events.

1 files changed, 8 insertions, 2 deletions

diff --git a/services/java/com/android/server/InputManager.java b/services/java/com/android/server/InputManager.java
index fe306b319395..c174b1103f3d 100644
--- a/services/java/com/android/server/InputManager.java
+++ b/services/java/com/android/server/InputManager.java
@@ -49,6 +49,8 @@ import java.util.Properties;
 public class InputManager {
     static final String TAG = "InputManager";
     
+    private static final boolean DEBUG = false;
+
     private final Callbacks mCallbacks;
     private final Context mContext;
     private final WindowManagerService mWindowManagerService;
@@ -131,7 +133,9 @@ public class InputManager {
             throw new IllegalArgumentException("Invalid display id or dimensions.");
         }
         
-        Slog.i(TAG, "Setting display #" + displayId + " size to " + width + "x" + height);
+        if (DEBUG) {
+            Slog.d(TAG, "Setting display #" + displayId + " size to " + width + "x" + height);
+        }
         nativeSetDisplaySize(displayId, width, height);
     }
     
@@ -140,7 +144,9 @@ public class InputManager {
             throw new IllegalArgumentException("Invalid rotation.");
         }
         
-        Slog.i(TAG, "Setting display #" + displayId + " orientation to " + rotation);
+        if (DEBUG) {
+            Slog.d(TAG, "Setting display #" + displayId + " orientation to " + rotation);
+        }
         nativeSetDisplayOrientation(displayId, rotation);
     }