commit 5b786ca88dbfe4dd224f6535996afdf1ae799f07
author Steven Ng <stevenckng@google.com> Wed Jun 23 21:01:57 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jun 23 21:01:57 2021 +0000
tree 11e4e84e400af8049bced938f4261e2da819996b
parent b7e15cf3b3070010aab8b0afbd3f59bd50db8b8b
parent 92335ed7bd6c4a9112ce7273fbd3af52fd837541

Merge "Add null check before detach content view from dragView at onDropComplete" into sc-dev

src/com/android/launcher3/Workspace.java

diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 303bb01..f28f54a 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -2792,7 +2792,7 @@
             }
         } else if (mDragInfo != null) {
             // When drag is cancelled, reattach content view back to its original parent.
-            if (mDragInfo.cell instanceof LauncherAppWidgetHostView) {
+            if (mDragInfo.cell instanceof LauncherAppWidgetHostView && d.dragView != null) {
                 d.dragView.detachContentView(/* reattachToPreviousParent= */ true);
             }
             final CellLayout cellLayout = mLauncher.getCellLayout(