diff options
| author | Adam Powell <adamp@google.com> | 2010-03-24 13:42:51 -0700 |
|---|---|---|
| committer | Adam Powell <adamp@google.com> | 2010-03-24 13:42:51 -0700 |
| commit | 9d0335b1e3a2c70506db2413ac8d8a0f88ba6bec (patch) | |
| tree | 557b52905ceb78bd1065f775df134b027ac06c32 | |
| parent | ea08c513549c1ddd9ba32337cb30973d7b61ca32 (diff) | |
| download | frameworks_base-9d0335b1e3a2c70506db2413ac8d8a0f88ba6bec.zip frameworks_base-9d0335b1e3a2c70506db2413ac8d8a0f88ba6bec.tar.gz frameworks_base-9d0335b1e3a2c70506db2413ac8d8a0f88ba6bec.tar.bz2 | |
Fix for bug 2502886 - stupid monkeys.
Plugged a possible edge case with ScrollView/HorizontalScrollView that
could cause this error.
Change-Id: I509004189b9f5e536d6213c9fdfff598d9f958ca
| -rw-r--r-- | core/java/android/widget/HorizontalScrollView.java | 8 | ||||
| -rw-r--r-- | core/java/android/widget/ScrollView.java | 8 |
2 files changed, 14 insertions, 2 deletions
diff --git a/core/java/android/widget/HorizontalScrollView.java b/core/java/android/widget/HorizontalScrollView.java index 702ce0a..0bbf7b8 100644 --- a/core/java/android/widget/HorizontalScrollView.java +++ b/core/java/android/widget/HorizontalScrollView.java @@ -410,7 +410,13 @@ public class HorizontalScrollView extends FrameLayout { * Locally do absolute value. mLastMotionX is set to the x value * of the down event. */ - final int pointerIndex = ev.findPointerIndex(mActivePointerId); + final int activePointerId = mActivePointerId; + if (activePointerId == INVALID_POINTER) { + // If we don't have a valid id, the touch down wasn't on content. + break; + } + + final int pointerIndex = ev.findPointerIndex(activePointerId); final float x = ev.getX(pointerIndex); final int xDiff = (int) Math.abs(x - mLastMotionX); if (xDiff > mTouchSlop) { diff --git a/core/java/android/widget/ScrollView.java b/core/java/android/widget/ScrollView.java index f009432..3cf2af2 100644 --- a/core/java/android/widget/ScrollView.java +++ b/core/java/android/widget/ScrollView.java @@ -408,7 +408,13 @@ public class ScrollView extends FrameLayout { * Locally do absolute value. mLastMotionY is set to the y value * of the down event. */ - final int pointerIndex = ev.findPointerIndex(mActivePointerId); + final int activePointerId = mActivePointerId; + if (activePointerId == INVALID_POINTER) { + // If we don't have a valid id, the touch down wasn't on content. + break; + } + + final int pointerIndex = ev.findPointerIndex(activePointerId); final float y = ev.getY(pointerIndex); final int yDiff = (int) Math.abs(y - mLastMotionY); if (yDiff > mTouchSlop) { |