am bca63d4c: am b6341e9e: Fix launcher crash

Merge commit 'bca63d4c5b67dc80e1d02a878f0c66202608372d' into eclair-mr2-plus-aosp * commit 'bca63d4c5b67dc80e1d02a878f0c66202608372d': Fix launcher crash
2009-11-02 09:03:30 -08:00
parent ddd7c497b7 bca63d4c5b
commit ca734ad238
1 changed files with 4 additions and 1 deletions
@@ -1318,7 +1318,10 @@ public final class Launcher extends Activity
        ViewGroup parent = (ViewGroup) folder.getParent();
        if (parent != null) {
            parent.removeView(folder);
-            mDragController.removeDropTarget((DropTarget)folder);
+            if (folder instanceof DropTarget) {
+                // Live folders aren't DropTargets.
+                mDragController.removeDropTarget((DropTarget)folder);
+            }
        }
        folder.onClose();
    }