From 92335ed7bd6c4a9112ce7273fbd3af52fd837541 Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Tue, 22 Jun 2021 23:26:05 +0100
Subject: [PATCH] Add null check before detach content view from dragView at
 onDropComplete

Test: Drop a conversation widget on a configuration button. No crash
      is observed.
Fix: 191762933
Change-Id: I483c6f4dbc9fc6c096383682284a4c854707f583
---
 src/com/android/launcher3/Workspace.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 303bb01df0..f28f54a024 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -2792,7 +2792,7 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
             }
         } 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(