commit 2cc95775750ccd46f3192c05804c38dc04c5d2d6
author Jim Miller <jaggies@google.com> Tue Oct 15 21:44:48 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Oct 15 21:44:48 2013 +0000
tree 5d1e1518828cb18981541296a5a510f69d79d121
parent 1fcf34d8208e4d56a288335a008e069ad895d4b3
parent faaa3654d1fbbcc73554a53bb11f0169853a94df

Merge "Fix possible crash in System UI" into klp-dev

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

diff --git a/packages/Keyguard/src/com/android/keyguard/PagedView.java b/packages/Keyguard/src/com/android/keyguard/PagedView.java
index 814ac982..9d237dc 100644
--- a/packages/Keyguard/src/com/android/keyguard/PagedView.java
+++ b/packages/Keyguard/src/com/android/keyguard/PagedView.java
@@ -1556,6 +1556,9 @@
             if (mTouchState == TOUCH_STATE_SCROLLING) {
                 final int activePointerId = mActivePointerId;
                 final int pointerIndex = ev.findPointerIndex(activePointerId);
+
+                if (pointerIndex == -1) return true;
+
                 final float x = ev.getX(pointerIndex);
                 final VelocityTracker velocityTracker = mVelocityTracker;
                 velocityTracker.computeCurrentVelocity(1000, mMaximumVelocity);