commit f2253e14468c600e348c95f8be37f8267d28d4e8
author Michael Jurka <mikejurka@google.com> Thu Jul 14 13:12:02 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jul 14 13:12:02 2011 -0700
tree feaed0be6703543aaeac552737b5805ae1ec86e5
parent 6cd835ce0b95aa9d593d0122eab7d7e4da781e23
parent 2698db4df3d2f9aa2a2c16af6760d63ba1ac354e

Merge "Fix a monkey crash"

src/com/android/launcher2/PagedView.java

diff --git a/src/com/android/launcher2/PagedView.java b/src/com/android/launcher2/PagedView.java
index fc82e54..9ef1fa8 100644
--- a/src/com/android/launcher2/PagedView.java
+++ b/src/com/android/launcher2/PagedView.java
@@ -929,6 +929,9 @@
          * of the down event.
          */
         final int pointerIndex = ev.findPointerIndex(mActivePointerId);
+        if (pointerIndex == -1) {
+            return;
+        }
         final float x = ev.getX(pointerIndex);
         final float y = ev.getY(pointerIndex);
         final int xDiff = (int) Math.abs(x - mLastMotionX);