diff options
| author | Joe Onorato <joeo@android.com> | 2010-02-19 13:39:12 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-02-19 13:39:12 -0800 |
| commit | 869228dadb0e537ce9138dc613c4cbc7e1aed1d3 (patch) | |
| tree | 7f2042e0127a8d31156d374bcc3953510b1c5bfd | |
| parent | 4baee90d22f02b1f31dcc7bca3bb9ad7263539ad (diff) | |
| parent | 3c24aca5f597f2eb90e53dce450197e2f46c2305 (diff) | |
| download | android_packages_apps_Trebuchet-869228dadb0e537ce9138dc613c4cbc7e1aed1d3.tar.gz android_packages_apps_Trebuchet-869228dadb0e537ce9138dc613c4cbc7e1aed1d3.tar.bz2 android_packages_apps_Trebuchet-869228dadb0e537ce9138dc613c4cbc7e1aed1d3.zip | |
am 3c24aca5: Don\'t crash when adding a shortcut.
Merge commit '3c24aca5f597f2eb90e53dce450197e2f46c2305' into eclair-plus-aosp
* commit '3c24aca5f597f2eb90e53dce450197e2f46c2305':
Don't crash when adding a shortcut.
| -rw-r--r-- | src/com/android/launcher2/Workspace.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java index b93965b1c..f3ffeaf2d 100644 --- a/src/com/android/launcher2/Workspace.java +++ b/src/com/android/launcher2/Workspace.java @@ -963,7 +963,7 @@ public class Workspace extends ViewGroup implements DropTarget, DragSource, Drag switch (info.itemType) { case LauncherSettings.Favorites.ITEM_TYPE_APPLICATION: case LauncherSettings.Favorites.ITEM_TYPE_SHORTCUT: - if (info.container == NO_ID) { + if (info.container == NO_ID && info instanceof ApplicationInfo) { // Came from all apps -- make a copy info = new ShortcutInfo((ApplicationInfo)info); } |