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

Commit a62996e3 authored by Jim Miller's avatar Jim Miller Committed by Android Git Automerger
Browse files

am 2f567679: am 2f48c4a7: Merge "Check for invalid pointer index in PagedView" into jb-mr2-dev 

* commit '2f567679':
  Check for invalid pointer index in PagedView
parents d0789904 2f567679

packages/Keyguard/src/com/android/keyguard/PagedView.java

+4 −1
Original line number Diff line number Diff line
@@ -1348,6 +1348,9 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc 
            if (mTouchState == TOUCH_STATE_SCROLLING) {

                // Scroll to follow the motion event

                final int pointerIndex = ev.findPointerIndex(mActivePointerId);



                if (pointerIndex == -1) return true;



                final float x = ev.getX(pointerIndex);

                final float deltaX = mLastMotionX + mLastMotionXRemainder - x;