commit 0eb687fdc431e7eae4e8f2f4d5dd3a6e48779008
author Dan Sandler <dsandler@android.com> Fri Jan 10 13:24:55 2014 -0500
committer Dan Sandler <dsandler@android.com> Fri Jan 10 13:24:55 2014 -0500
tree ec028713e1a187de5eb8708a1e0d92a10564b619
parent b54a5989a21bef4e6bac304591ca4030bfbe709d

Quick patch for b/12446428.

Bug: 12446428
Change-Id: I5b9472e55a8919f5640c6e97fede9b5637819be0

src/com/android/launcher3/Folder.java

diff --git a/src/com/android/launcher3/Folder.java b/src/com/android/launcher3/Folder.java
index 758ee5b..a9a161a 100644
--- a/src/com/android/launcher3/Folder.java
+++ b/src/com/android/launcher3/Folder.java
@@ -1107,7 +1107,10 @@
                 if (getItemCount() <= 1) {
                     // Remove the folder
                     LauncherModel.deleteItemFromDatabase(mLauncher, mInfo);
-                    cellLayout.removeView(mFolderIcon);
+                    if (cellLayout != null) {
+                        // b/12446428 -- sometimes the cell layout has already gone away?
+                        cellLayout.removeView(mFolderIcon);
+                    }
                     if (mFolderIcon instanceof DropTarget) {
                         mDragController.removeDropTarget((DropTarget) mFolderIcon);
                     }