Merge "Fix crash when hotseat icon is dragged onto Workspace" into sc-v2-dev

This commit is contained in:
TreeHugger Robot authored and Android (Google) Code Review committed 2021-09-06 17:07:01 +00:00
commit ce10de7964
1 file changed
+2 -1
+2 -1
View File
@@ -647,7 +647,8 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
if (mDragSourceInternal != null) {
int dragSourceChildCount = mDragSourceInternal.getChildCount();
if (isTwoPanelEnabled()) {
// If the icon was dragged from Hotseat, there is no page pair
if (isTwoPanelEnabled() && !(mDragSourceInternal.getParent() instanceof Hotseat)) {
int pagePairScreenId = getPagePair(dragObject.dragInfo.screenId);
CellLayout pagePair = mWorkspaceScreens.get(pagePairScreenId);
if (pagePair == null) {