commit 3a813de8e1d2482f1aa06c4cfa8d467bedcb8e6f
author Steven Ng <stevenckng@google.com> Wed Jun 23 21:16:53 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Jun 23 21:16:53 2021 +0000
tree bdd61341aed3a4e0f0a8a36b78bdfa3ffd31b41d
parent 565d7d8ec5476f9af3448d5af54a1195ebeb301a
parent 5b786ca88dbfe4dd224f6535996afdf1ae799f07

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

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

Change-Id: I837c61ddaecacf198ce89be0949e79f29a2c7a3d

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(