diff options
| author | Michael Jurka <mikejurka@google.com> | 2012-06-27 11:48:37 -0700 |
|---|---|---|
| committer | Michael Jurka <mikejurka@google.com> | 2012-06-27 11:51:21 -0700 |
| commit | 087f7a64bce5c7b5868d4cc22a369ccfe6d3fc1f (patch) | |
| tree | aadeac2b1d15bf4c5778c1bacadf02bcbd42a1da /src | |
| parent | 816474f06b9bea400f4511fa35b63a7f18a54c54 (diff) | |
| download | android_packages_apps_Trebuchet-087f7a64bce5c7b5868d4cc22a369ccfe6d3fc1f.tar.gz android_packages_apps_Trebuchet-087f7a64bce5c7b5868d4cc22a369ccfe6d3fc1f.tar.bz2 android_packages_apps_Trebuchet-087f7a64bce5c7b5868d4cc22a369ccfe6d3fc1f.zip | |
Fix crash when adding shortcuts
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher2/LauncherModel.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/launcher2/LauncherModel.java b/src/com/android/launcher2/LauncherModel.java index 520d3f4bc..6080411b3 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") + |