commit 5649c287039ea7908112b41604c3fc2893c4697e
author Michael Jurka <mikejurka@google.com> Mon Jun 18 10:33:21 2012 -0700
committer Michael Jurka <mikejurka@google.com> Mon Jun 18 10:40:03 2012 -0700
tree 4967905cea142ea165177bdae454776c74b68298
parent a35a7807c27641187e6de5dee8dcd405b683e294

Add null pointer checks to fix NPEs

Bug: 6611233
Bug: 6685401

Change-Id: I804dfe0a7ad36b43168f7384ef88459d765fff6b

src/com/android/launcher2/Folder.java

diff --git a/src/com/android/launcher2/Folder.java b/src/com/android/launcher2/Folder.java
index 1163f9e..de2e435 100644
--- a/src/com/android/launcher2/Folder.java
+++ b/src/com/android/launcher2/Folder.java
@@ -923,7 +923,9 @@
 
     private void onCloseComplete() {
         DragLayer parent = (DragLayer) getParent();
-        parent.removeView(this);
+        if (parent != null) {
+            parent.removeView(this);
+        }
         mDragController.removeDropTarget((DropTarget) this);
         clearFocus();
         mFolderIcon.requestFocus();