commit 8c604349c7fabfe45f7f1474e4475646c1b9d195
author Jean-Baptiste Queru <jbq@google.com> Tue Nov 23 13:58:19 2010 -0800
committer Android Code Review <code-review@android.com> Tue Nov 23 13:58:19 2010 -0800
tree 0b479c731c3c3cce857c0bd3ce70e3646394abe9
parent 35e79e32808456a7f5f21126ed2fa7badf8dc0bc
parent bc423039676ed9d5255151489e27a054e8ed6899

Merge "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 c337c30..cba1a3b 100644
--- a/src/com/android/launcher2/Workspace.java
+++ b/src/com/android/launcher2/Workspace.java
@@ -732,10 +732,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);
+                        }
                     }
                 }