commit ca734ad2387629ff9afcd0d5c991074f8212920f
author Joe Onorato <joeo@android.com> Mon Nov 02 09:03:30 2009 -0800
committer Android Git Automerger <android-git-automerger@android.com> Mon Nov 02 09:03:30 2009 -0800
tree a5af0fd0ac54b015ec9122a44f5b2f40cc34121a
parent ddd7c497b730ac6bb013a6f1f35df32c4bf7df3f
parent bca63d4c5b67dc80e1d02a878f0c66202608372d

am bca63d4c: am b6341e9e: Fix launcher crash

Merge commit 'bca63d4c5b67dc80e1d02a878f0c66202608372d' into eclair-mr2-plus-aosp

* commit 'bca63d4c5b67dc80e1d02a878f0c66202608372d':
  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();
     }