diff options
| author | Joe Onorato <joeo@android.com> | 2010-02-19 13:10:40 -0800 |
|---|---|---|
| committer | Joe Onorato <joeo@android.com> | 2010-02-19 13:34:55 -0800 |
| commit | 3c24aca5f597f2eb90e53dce450197e2f46c2305 (patch) | |
| tree | 7f2042e0127a8d31156d374bcc3953510b1c5bfd /src | |
| parent | 75dc3a9d28a184358127390329b36a5a520c212c (diff) | |
| download | android_packages_apps_Trebuchet-3c24aca5f597f2eb90e53dce450197e2f46c2305.tar.gz android_packages_apps_Trebuchet-3c24aca5f597f2eb90e53dce450197e2f46c2305.tar.bz2 android_packages_apps_Trebuchet-3c24aca5f597f2eb90e53dce450197e2f46c2305.zip | |
Don't crash when adding a shortcut.
Steps to reproduce: Menu > Add > Shortcut > Application > [any app]
E/AndroidRuntime( 1734): Caused by: java.lang.ClassCastException: com.android.launcher2.ShortcutInfo
E/AndroidRuntime( 1734): at com.android.launcher2.Workspace.onDropExternal(Workspace.java:963)
E/AndroidRuntime( 1734): at
com.android.launcher2.Workspace.addApplicationShortcut(Workspace.java:903)
E/AndroidRuntime( 1734): at
com.android.launcher2.Launcher.completeAddApplication(Launcher.java:669)
E/AndroidRuntime( 1734): at com.android.launcher2.Launcher.onActivityResult(Launcher.java:371)
E/AndroidRuntime( 1734): at android.app.Activity.dispatchActivityResult(Activity.java:3877)
E/AndroidRuntime( 1734): at android.app.ActivityThread.deliverResults(ActivityThread.java:3340)
Diffstat (limited to 'src')
| -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); } |