commit 323caa34b921782a5765b49b72a2483f76ee85de
author Jean-Baptiste Queru <jbq@google.com> Tue Nov 23 14:12:28 2010 -0800
committer Android Git Automerger <android-git-automerger@android.com> Tue Nov 23 14:12:28 2010 -0800
tree 7d13c08dd903e8a0afd2e425389debfecb6e87cd
parent 4dd45be8afa39c88781364933e819e8734732d17
parent 8c604349c7fabfe45f7f1474e4475646c1b9d195

am 8c604349: Merge "Fix for a Launcher crash."

* commit '8c604349c7fabfe45f7f1474e4475646c1b9d195':
  Fix for a Launcher crash.

src/com/android/launcher2/Workspace.java

diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java
index c182209..d193448 100644
--- a/src/com/android/launcher2/Workspace.java
+++ b/src/com/android/launcher2/Workspace.java
@@ -726,10 +726,12 @@
                         getLocationOnScreen(mTempCell);
                         // Send a tap to the wallpaper if the last down was on empty space
                         final int pointerIndex = ev.findPointerIndex(mActivePointerId);
-                        mWallpaperManager.sendWallpaperCommand(getWindowToken(), 
-                                "android.wallpaper.tap",
-                                mTempCell[0] + (int) ev.getX(pointerIndex),
-                                mTempCell[1] + (int) ev.getY(pointerIndex), 0, null);
+                        if (pointerIndex >= 0) {
+                            mWallpaperManager.sendWallpaperCommand(getWindowToken(),
+                                    "android.wallpaper.tap",
+                                    mTempCell[0] + (int) ev.getX(pointerIndex),
+                                    mTempCell[1] + (int) ev.getY(pointerIndex), 0, null);
+                        }
                     }
                 }