commit b134e677b9e3a151489100aee5318a63ff9c8988
author Steven Ng <stevenckng@google.com> Wed Jun 23 21:25:39 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Jun 23 21:25:39 2021 +0000
tree f1aa42b22e70a5417942c22829b0e9dd2902a425
parent e91ee8c09cfd340185cb7eb602a455555f195a5f
parent f5555fcb8efb8272ebc0a930a1633424ae62c3be

Merge "Add null check before detach content view from dragView at onDropComplete" into sc-dev am: 5b786ca88d am: f5555fcb8e

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15042822

Change-Id: I6101875d35cafb8664a0f8f07d5a127a2e37189c

src/com/android/launcher3/Workspace.java

diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index a08fa1f..f412f92 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -2836,7 +2836,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(