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

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

Change-Id: Ie51e47b2db3ab8a7f121490ef1b8a739f47542f7

src/com/android/launcher3/Workspace.java

@@ -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) {