diff options
| author | nebkat <nebkat@teamhacksung.org> | 2012-12-02 21:56:34 +0000 |
|---|---|---|
| committer | nebkat <nebkat@teamhacksung.org> | 2012-12-02 21:56:34 +0000 |
| commit | c6314742215f9780b6c72098a31d9e5579fedf73 (patch) | |
| tree | ea0ab449bbd71bba75273a91b974160142ce4f90 /src/com/cyanogenmod/trebuchet/LauncherModel.java | |
| parent | 2dfb053932c106321dfe665d5d8e5d7c954f50bc (diff) | |
| download | packages_apps_trebuchet-c6314742215f9780b6c72098a31d9e5579fedf73.tar.gz packages_apps_trebuchet-c6314742215f9780b6c72098a31d9e5579fedf73.tar.bz2 packages_apps_trebuchet-c6314742215f9780b6c72098a31d9e5579fedf73.zip | |
LauncherModel: Fix possible NPE
Change-Id: I97a48c62a4b111b2b6a20093e8b7346fec9ae3ea
Diffstat (limited to 'src/com/cyanogenmod/trebuchet/LauncherModel.java')
| -rw-r--r-- | src/com/cyanogenmod/trebuchet/LauncherModel.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/cyanogenmod/trebuchet/LauncherModel.java b/src/com/cyanogenmod/trebuchet/LauncherModel.java index 8fd5af21..f3face7b 100644 --- a/src/com/cyanogenmod/trebuchet/LauncherModel.java +++ b/src/com/cyanogenmod/trebuchet/LauncherModel.java @@ -351,8 +351,8 @@ 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: |