diff options
| author | 2013-10-15 13:46:51 -0700 | |
|---|---|---|
| committer | 2013-10-15 13:46:51 -0700 | |
| commit | faaa3654d1fbbcc73554a53bb11f0169853a94df (patch) | |
| tree | fc5b521191950b15fbf1bc31aae4c1dee4b5bab7 | |
| parent | 1680cfd803d6a435ce4c809075d052da2723ac07 (diff) | |
Fix possible crash in System UI
Fixes bug 11215581
Change-Id: Ic76ad783729316539e8e57feb098d6e823b4ecdf
| -rw-r--r-- | packages/Keyguard/src/com/android/keyguard/PagedView.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/packages/Keyguard/src/com/android/keyguard/PagedView.java b/packages/Keyguard/src/com/android/keyguard/PagedView.java index 23488d44a6e3..9d31ab00c7c5 100644 --- a/packages/Keyguard/src/com/android/keyguard/PagedView.java +++ b/packages/Keyguard/src/com/android/keyguard/PagedView.java @@ -1553,6 +1553,9 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc 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); |