diff options
| author | Winson Chung <winsonc@google.com> | 2013-12-10 01:17:03 +0000 |
|---|---|---|
| committer | Winson Chung <winsonc@google.com> | 2013-12-10 01:17:03 +0000 |
| commit | 72b520c956a4bf11f6dbbac7eb5e18001b7a11cb (patch) | |
| tree | ac35acc9283717d5bc80aa7280d380af3cc2bc65 /src/com/android/launcher3/LauncherModel.java | |
| parent | 68b667848ef7c6f69b24a40d780e4088a5f2a1fb (diff) | |
| download | android_packages_apps_Trebuchet-72b520c956a4bf11f6dbbac7eb5e18001b7a11cb.tar.gz android_packages_apps_Trebuchet-72b520c956a4bf11f6dbbac7eb5e18001b7a11cb.tar.bz2 android_packages_apps_Trebuchet-72b520c956a4bf11f6dbbac7eb5e18001b7a11cb.zip | |
Revert "Fixing crash in empty folders. (Bug 11627191)"
This reverts commit 68b667848ef7c6f69b24a40d780e4088a5f2a1fb.
Change-Id: I51da495d6f8ef98b268c23cce02cce5ef1c7ea00
Diffstat (limited to 'src/com/android/launcher3/LauncherModel.java')
| -rw-r--r-- | src/com/android/launcher3/LauncherModel.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java index a69617ac7..74f28b304 100644 --- a/src/com/android/launcher3/LauncherModel.java +++ b/src/com/android/launcher3/LauncherModel.java @@ -584,9 +584,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 != null && - (modelItem.container == LauncherSettings.Favorites.CONTAINER_DESKTOP || - modelItem.container == LauncherSettings.Favorites.CONTAINER_HOTSEAT)) { + if (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: |