diff options
| -rw-r--r-- | core/java/android/view/ScaleGestureDetector.java | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/core/java/android/view/ScaleGestureDetector.java b/core/java/android/view/ScaleGestureDetector.java index d638e70..6a21b5a 100644 --- a/core/java/android/view/ScaleGestureDetector.java +++ b/core/java/android/view/ScaleGestureDetector.java @@ -329,6 +329,15 @@ public class ScaleGestureDetector { // Set focus point to the remaining finger final int index = event.findPointerIndex(actionId == mActiveId0 ? mActiveId1 : mActiveId0); + if (index < 0) { + mInvalidGesture = true; + Log.e(TAG, "Invalid MotionEvent stream detected.", new Throwable()); + if (mGestureInProgress) { + mListener.onScaleEnd(this); + } + return false; + } + mActiveId0 = event.getPointerId(index); mActive0MostRecent = true; |