From 0eb687fdc431e7eae4e8f2f4d5dd3a6e48779008 Mon Sep 17 00:00:00 2001
From: Dan Sandler <dsandler@android.com>
Date: Fri, 10 Jan 2014 13:24:55 -0500
Subject: [PATCH] Quick patch for b/12446428.

Bug: 12446428
Change-Id: I5b9472e55a8919f5640c6e97fede9b5637819be0
---
 src/com/android/launcher3/Folder.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/Folder.java b/src/com/android/launcher3/Folder.java
index 758ee5baba..a9a161ab80 100644
--- a/src/com/android/launcher3/Folder.java
+++ b/src/com/android/launcher3/Folder.java
@@ -1107,7 +1107,10 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList
                 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);
                     }