Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 92335ed7 authored by Steven Ng's avatar Steven Ng
Browse files

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
parent 719be9a9

src/com/android/launcher3/Workspace.java

+1 −1
Original line number Diff line number Diff line
@@ -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(