Merge "Fix pointer index out of range exception DO NOT MERGE" into lmp-mr1-dev

2015-01-08 18:34:00 +00:00
parent a7881fd30b 1ab7d3b9a8
commit 28a4cea5a0
1 changed files with 1 additions and 0 deletions
--- a/services/core/java/com/android/server/wm/StackTapPointerEventListener.java
+++ b/services/core/java/com/android/server/wm/StackTapPointerEventListener.java
@@ -57,6 +57,7 @@ public class StackTapPointerEventListener implements PointerEventListener {
                if (mPointerId >= 0) {
                    int index = motionEvent.findPointerIndex(mPointerId);
                    if ((motionEvent.getEventTime() - motionEvent.getDownTime()) > TAP_TIMEOUT_MSEC
+                            || index < 0
                            || (motionEvent.getX(index) - mDownX) > mMotionSlop
                            || (motionEvent.getY(index) - mDownY) > mMotionSlop) {
                        mPointerId = -1;