diff options
| author | Winson Chung <winsonc@google.com> | 2013-12-09 16:57:45 -0800 |
|---|---|---|
| committer | Winson Chung <winsonc@google.com> | 2013-12-09 17:24:48 -0800 |
| commit | 33231f587e1a6f716af68e6198df774d2847a8e5 (patch) | |
| tree | 21357b3a777ad0ab5eb9f2c9628157897b44602b /src/com/android/launcher3/LauncherModel.java | |
| parent | fe2fb82657d52c17c9a09fb74e140b80db634a8c (diff) | |
| download | android_packages_apps_Trebuchet-33231f587e1a6f716af68e6198df774d2847a8e5.tar.gz android_packages_apps_Trebuchet-33231f587e1a6f716af68e6198df774d2847a8e5.tar.bz2 android_packages_apps_Trebuchet-33231f587e1a6f716af68e6198df774d2847a8e5.zip | |
Fixing crash in empty folders. (Bug 11627191)
Change-Id: I7a0e23e16a7546a9612d3406257e15be758d4c52
Signed-off-by: Winson Chung <winsonc@google.com>
Diffstat (limited to 'src/com/android/launcher3/LauncherModel.java')
| -rw-r--r-- | src/com/android/launcher3/LauncherModel.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java index 74f28b304..a69617ac7 100644 --- a/src/com/android/launcher3/LauncherModel.java +++ b/src/com/android/launcher3/LauncherModel.java @@ -584,8 +584,9 @@ public class LauncherModel extends BroadcastReceiver { // as in Workspace.onDrop. Here, we just add/remove them from the list of items // that are on the desktop, as appropriate ItemInfo modelItem = sBgItemsIdMap.get(itemId); - if (modelItem.container == LauncherSettings.Favorites.CONTAINER_DESKTOP || - modelItem.container == LauncherSettings.Favorites.CONTAINER_HOTSEAT) { + if (modelItem != null && + (modelItem.container == LauncherSettings.Favorites.CONTAINER_DESKTOP || + modelItem.container == LauncherSettings.Favorites.CONTAINER_HOTSEAT)) { switch (modelItem.itemType) { case LauncherSettings.Favorites.ITEM_TYPE_APPLICATION: case LauncherSettings.Favorites.ITEM_TYPE_SHORTCUT: |