commit 672018edcc513b1e605d3502ecfbec25c6850598
author Steven Ng <stevenckng@google.com> Wed Jun 23 21:25:11 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Jun 23 21:25:11 2021 +0000
tree 95a7886f612bfb8c62514bdef28541a32f7a2068
parent 9bc0939a107ab247ed205e8a49bb4ffc386ec51a
parent 8ec3545fb29012cfa5947320c60f67516c78ee37

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

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

Change-Id: I98d191aa4bfea42cb90b36dbf7875bd55c385c7c

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(