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

* commit '8c604349c7fabfe45f7f1474e4475646c1b9d195': Fix for a Launcher crash.
2010-11-23 14:12:28 -08:00
parent 4dd45be8af 8c604349c7
commit 323caa34b9
1 changed files with 6 additions and 4 deletions
@@ -726,10 +726,12 @@ public class Workspace extends ViewGroup implements DropTarget, DragSource, Drag
                        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);
+                        }
                    }
                }