diff options
| author | Jim Miller <jaggies@google.com> | 2013-05-23 20:38:02 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-05-23 21:03:09 +0000 |
| commit | 2f48c4a754ce40a0854791c1f4ddf61458fffafc (patch) | |
| tree | a4908f0799ba89048c6112471f9283f9c1310ac1 | |
| parent | 55bf965e89df5986a7a988c2b1ec2cd9f01edb56 (diff) | |
| parent | d794e648c313f0c4c8f89a9032fdee26b67a078c (diff) | |
| download | frameworks_base-2f48c4a754ce40a0854791c1f4ddf61458fffafc.zip frameworks_base-2f48c4a754ce40a0854791c1f4ddf61458fffafc.tar.gz frameworks_base-2f48c4a754ce40a0854791c1f4ddf61458fffafc.tar.bz2 | |
Merge "Check for invalid pointer index in PagedView" into jb-mr2-dev
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/keyguard/PagedView.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/policy/src/com/android/internal/policy/impl/keyguard/PagedView.java b/policy/src/com/android/internal/policy/impl/keyguard/PagedView.java index 186a013..10562e8 100644 --- a/policy/src/com/android/internal/policy/impl/keyguard/PagedView.java +++ b/policy/src/com/android/internal/policy/impl/keyguard/PagedView.java @@ -86,7 +86,7 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc private static final int MIN_SNAP_VELOCITY = 1500; private static final int MIN_FLING_VELOCITY = 250; - // We are disabling touch interaction of the widget region for factory ROM. + // We are disabling touch interaction of the widget region for factory ROM. private static final boolean DISABLE_TOUCH_INTERACTION = false; private static final boolean DISABLE_TOUCH_SIDE_PAGES = true; private static final boolean DISABLE_FLING_TO_DELETE = false; @@ -1350,6 +1350,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; |