From 3c24aca5f597f2eb90e53dce450197e2f46c2305 Mon Sep 17 00:00:00 2001 From: Joe Onorato Date: Fri, 19 Feb 2010 13:10:40 -0800 Subject: [PATCH] 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) --- src/com/android/launcher2/Workspace.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java index b93965b1c1..f3ffeaf2de 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); }