Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7ed8ff18 authored by Adam Powell's avatar Adam Powell Committed by Android Git Automerger
Browse files

am 68b81434: Merge "Fix bug 4533120 - rough handling of invalid event streams... 

am 68b81434: Merge "Fix bug 4533120 - rough handling of invalid event streams in ScaleGestureDetector" into honeycomb-mr2

* commit '68b81434':
  Fix bug 4533120 - rough handling of invalid event streams in ScaleGestureDetector
parents fc94d45f 68b81434

core/java/android/view/ScaleGestureDetector.java

+9 −0
Original line number Diff line number Diff line
@@ -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;