From b56e95af5d46510334e01b109c4ec34f46be4562 Mon Sep 17 00:00:00 2001
From: Daniel Sandler <dsandler@android.com>
Date: Wed, 4 Sep 2013 23:13:39 -0400
Subject: Fix crash on uninstall via drag.

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

diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 01a8adf77..9007b58b7 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -3493,7 +3493,10 @@ public class Workspace extends SmoothPagedView
 
         if (success && !(beingCalledAfterUninstall && !mUninstallSuccessful)) {
             if (target != this && mDragInfo != null) {
-                getParentCellLayoutForView(mDragInfo.cell).removeView(mDragInfo.cell);
+                CellLayout parentCell = getParentCellLayoutForView(mDragInfo.cell);
+                if (parentCell != null) {
+                    parentCell.removeView(mDragInfo.cell);
+                }
                 if (mDragInfo.cell instanceof DropTarget) {
                     mDragController.removeDropTarget((DropTarget) mDragInfo.cell);
                 }
-- 
cgit v1.2.3