commit 8ec3545fb29012cfa5947320c60f67516c78ee37
author Steven Ng <stevenckng@google.com> Wed Jun 23 21:16:57 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Jun 23 21:16:57 2021 +0000
tree 60a9c54d0645f7f1de546b814c7d878c79712835
parent bb92f9b06b2612359aa9970f0b46fc7786d5ee42
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: Ib55c3525909d6a4b4e4123c9197c364147e3639f

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(