diff options
| author | Dan Sandler <dsandler@android.com> | 2014-01-10 13:24:55 -0500 |
|---|---|---|
| committer | Dan Sandler <dsandler@android.com> | 2014-01-10 13:24:55 -0500 |
| commit | 0eb687fdc431e7eae4e8f2f4d5dd3a6e48779008 (patch) | |
| tree | ec028713e1a187de5eb8708a1e0d92a10564b619 /src/com/android/launcher3/Folder.java | |
| parent | b54a5989a21bef4e6bac304591ca4030bfbe709d (diff) | |
| download | android_packages_apps_Trebuchet-0eb687fdc431e7eae4e8f2f4d5dd3a6e48779008.tar.gz android_packages_apps_Trebuchet-0eb687fdc431e7eae4e8f2f4d5dd3a6e48779008.tar.bz2 android_packages_apps_Trebuchet-0eb687fdc431e7eae4e8f2f4d5dd3a6e48779008.zip | |
Quick patch for b/12446428.
Bug: 12446428
Change-Id: I5b9472e55a8919f5640c6e97fede9b5637819be0
Diffstat (limited to 'src/com/android/launcher3/Folder.java')
| -rw-r--r-- | src/com/android/launcher3/Folder.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/launcher3/Folder.java b/src/com/android/launcher3/Folder.java index 758ee5bab..a9a161ab8 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); } |