Merge "Add null check before detach content view from dragView at onDropComplete" into sc-dev

This commit is contained in:
Steven Ng
2021-06-23 21:01:57 +00:00
committed by Android (Google) Code Review

View File

@@ -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(