From 982cb98393151921aceb0b214b14a1f9b473b71e Mon Sep 17 00:00:00 2001
From: Adam Powell <adamp@google.com>
Date: Tue, 7 Jun 2011 16:13:08 -0700
Subject: Fix bug 4533120 - rough handling of invalid event streams in
 ScaleGestureDetector

Make ScaleGestureDetector a bit more tolerant of bogus event streams.

Change-Id: I28a8b1ea494b7f1ca9d4c4623b95aee38f213369
---
 core/java/android/view/ScaleGestureDetector.java | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/core/java/android/view/ScaleGestureDetector.java b/core/java/android/view/ScaleGestureDetector.java
index d638e7080b32..6a21b5a22b63 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;
-- 
cgit v1.2.3-59-g8ed1b