commit 087f7a64bce5c7b5868d4cc22a369ccfe6d3fc1f
author Michael Jurka <mikejurka@google.com> Wed Jun 27 11:48:37 2012 -0700
committer Michael Jurka <mikejurka@google.com> Wed Jun 27 11:51:21 2012 -0700
tree aadeac2b1d15bf4c5778c1bacadf02bcbd42a1da
parent 816474f06b9bea400f4511fa35b63a7f18a54c54

Fix crash when adding shortcuts

src/com/android/launcher2/LauncherModel.java

diff --git a/src/com/android/launcher2/LauncherModel.java b/src/com/android/launcher2/LauncherModel.java
index 520d3f4..6080411 100644
--- a/src/com/android/launcher2/LauncherModel.java
+++ b/src/com/android/launcher2/LauncherModel.java
@@ -214,7 +214,7 @@
         Runnable r = new Runnable() {
                 public void run() {
                     ItemInfo modelItem = sItemsIdMap.get(itemId);
-                    if (item != modelItem) {
+                    if (modelItem != null && item != modelItem) {
                         // the modelItem needs to match up perfectly with item if our model is to be
                         // consistent with the database-- for now, just require modelItem == item
                         String msg = "item: " + ((item != null) ? item.toString() : "null") +