summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCraig Mautner <cmautner@google.com>2014-12-01 00:13:27 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-12-01 00:13:28 +0000
commit94ac906b103b0f03eca2000815bf306209f33109 (patch)
tree2a38f97982a2e1381c167ecfe457225c70b381ed
parent208bd91b2467dd5d4c41d5ada5c2bfa15c1b48c4 (diff)
parent4f65ca0f763eecf5521c56986a2b325d32544a37 (diff)
downloadbase-94ac906b103b0f03eca2000815bf306209f33109.tar.gz
Merge "Fix pointer index out of range exception"
-rw-r--r--services/core/java/com/android/server/wm/StackTapPointerEventListener.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/wm/StackTapPointerEventListener.java b/services/core/java/com/android/server/wm/StackTapPointerEventListener.java
index 75734002dbc9..80eb453cdfea 100644
--- 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
|| Math.abs(motionEvent.getX(index) - mDownX) > mMotionSlop
|| Math.abs(motionEvent.getY(index) - mDownY) > mMotionSlop) {
mPointerId = -1;