commit bca63d4c5b67dc80e1d02a878f0c66202608372d
author Joe Onorato <joeo@android.com> Mon Nov 02 08:54:36 2009 -0800
committer Android Git Automerger <android-git-automerger@android.com> Mon Nov 02 08:54:36 2009 -0800
tree a5af0fd0ac54b015ec9122a44f5b2f40cc34121a
parent f758fd3a446dd336ea8ed13c1ee5310ea5f1e083
parent b6341e9ee293cfbccc553f0d204a1087968d6482

am b6341e9e: Fix launcher crash

Merge commit 'b6341e9ee293cfbccc553f0d204a1087968d6482' into eclair-mr2

* commit 'b6341e9ee293cfbccc553f0d204a1087968d6482':
  Fix launcher crash

src/com/android/launcher2/Launcher.java

diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index 168b754..86bc4ba 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -1318,7 +1318,10 @@
         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();
     }