am 36beeca4: am 3d8c9bdb: Raise motion event throttle to 60Hz from 35Hz.

Merge commit '36beeca4c34af2aed6a070e43b69993daff67661'

* commit '36beeca4c34af2aed6a070e43b69993daff67661':
  Raise motion event throttle to 60Hz from 35Hz.

2 files changed, 2 insertions, 5 deletions

diff --git a/services/java/com/android/server/InputManager.java b/services/java/com/android/server/InputManager.java
index e54f1837c8c8..f330d40a80f6 100644
--- a/services/java/com/android/server/InputManager.java
+++ b/services/java/com/android/server/InputManager.java
@@ -48,9 +48,6 @@ import java.util.ArrayList;
 
 /*
  * Wraps the C++ InputManager and provides its callbacks.
- * 
- * XXX Tempted to promote this to a first-class service, ie. InputManagerService, to
- *     improve separation of concerns with respect to the window manager.
  */
 public class InputManager {
     static final String TAG = "InputManager";
@@ -517,7 +514,7 @@ public class InputManager {
             } catch (NumberFormatException e) {
             }
             if (result < 1) {
-                result = 35;
+                result = 60;
             }
             return result;
         }
diff --git a/services/jni/com_android_server_InputManager.cpp b/services/jni/com_android_server_InputManager.cpp
index 59528dba9174..3addc0d2e208 100644
--- a/services/jni/com_android_server_InputManager.cpp
+++ b/services/jni/com_android_server_InputManager.cpp
@@ -934,7 +934,7 @@ int32_t NativeInputManager::getMaxEventsPerSecond() {
         jint result = env->CallIntMethod(mCallbacksObj,
                 gCallbacksClassInfo.getMaxEventsPerSecond);
         if (checkAndClearExceptionFromCallback(env, "getMaxEventsPerSecond")) {
-            result = 35;
+            result = 60;
         }
 
         mMaxEventsPerSecond = result;