commit f5555fcb8efb8272ebc0a930a1633424ae62c3be
author Steven Ng <stevenckng@google.com> Wed Jun 23 21:17:48 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Jun 23 21:17:48 2021 +0000
tree 9a8e2b3c3ec1c10aa0cbd6ab20496dd5aed3a3ef
parent 7392cf9bbf0b3d3ed6ba12af9a0e2f6dc4e8e77b
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: Idc12dd2613200ce6e9901856b14c4ce0c5946fb6

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(