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.
This commit is contained in:
Joe Onorato
2010-02-19 13:39:12 -08:00
committed by Android Git Automerger

View File

@@ -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);
}