commit 1ab7d3b9a877a5054abd60133545ebafbcdb4e9a
author tingna_sung <tingna_sung@htc.com> Sat Oct 25 21:52:47 2014 +0800
committer Craig Mautner <cmautner@google.com> Thu Jan 08 15:57:52 2015 +0000
tree 55a0a2a6b396ea51e3c64836d8298aec21a318eb
parent f61bc8a2624bc70c903238229a62abc3351ed620

Fix pointer index out of range exception DO NOT MERGE

Avoid pointer index out of range error if return value is -1 of
findPointerIndex() when there is no data available for that pointer
identifier.

Change-Id: I2a08f04c678164e220852094baa124ba157e2e42
Signed-off-by: tingna_sung <tingna_sung@htc.com>

Fixes bug 18883936

services/core/java/com/android/server/wm/StackTapPointerEventListener.java

diff --git a/services/core/java/com/android/server/wm/StackTapPointerEventListener.java b/services/core/java/com/android/server/wm/StackTapPointerEventListener.java
index 19d8ab3..8938358 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 @@
                 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;