am 89888b2d: Merge change 20038 into donut
Merge commit '89888b2d9dc2d1994a8236ffbce5aaefd6782bf3'
* commit '89888b2d9dc2d1994a8236ffbce5aaefd6782bf3':
Remove debug code which reads the max_events_per_sec property on every touch event
diff --git a/services/java/com/android/server/WindowManagerService.java b/services/java/com/android/server/WindowManagerService.java
index edba5b6..ceb9c41 100644
--- a/services/java/com/android/server/WindowManagerService.java
+++ b/services/java/com/android/server/WindowManagerService.java
@@ -541,6 +541,17 @@
mTransitionAnimationScale = Settings.System.getFloat(context.getContentResolver(),
Settings.System.TRANSITION_ANIMATION_SCALE, mTransitionAnimationScale);
+ int max_events_per_sec = 35;
+ try {
+ max_events_per_sec = Integer.parseInt(SystemProperties
+ .get("windowsmgr.max_events_per_sec"));
+ if (max_events_per_sec < 1) {
+ max_events_per_sec = 35;
+ }
+ } catch (NumberFormatException e) {
+ }
+ mMinWaitTimeBetweenTouchEvents = 1000 / max_events_per_sec;
+
mQueue = new KeyQ();
mInputThread = new InputDispatcherThread();
@@ -4010,8 +4021,8 @@
}
} //end if target
- // TODO remove once we settle on a value or make it app specific
- if (action == MotionEvent.ACTION_DOWN) {
+ // Enable this for testing the "right" value
+ if (false && action == MotionEvent.ACTION_DOWN) {
int max_events_per_sec = 35;
try {
max_events_per_sec = Integer.parseInt(SystemProperties