From 087f7a64bce5c7b5868d4cc22a369ccfe6d3fc1f Mon Sep 17 00:00:00 2001 From: Michael Jurka Date: Wed, 27 Jun 2012 11:48:37 -0700 Subject: Fix crash when adding shortcuts --- src/com/android/launcher2/LauncherModel.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') 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 @@ public class LauncherModel extends BroadcastReceiver { 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") + -- cgit v1.1