summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/com/android/launcher3/Workspace.java5
1 files changed, 4 insertions, 1 deletions
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);
}