commit f0270040b7c74a9702545fc90d62d2b9fcbae385
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Sep 06 17:30:24 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Sep 06 17:30:24 2021 +0000
tree 400ac1de552a3738e8ad90c5d33a019f3dbb42e9
parent 663ebae20cdeeb0c8e0fe2a860fa0d50231f150c
parent fef84dd5ea2e427c4e1af18404c553d306dedbde

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

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

Change-Id: I99ee908d056147d354dce088e9eb751da3ae6f9f

src/com/android/launcher3/Workspace.java

diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 6ec48e5..a21c8e3 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -647,7 +647,8 @@
         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) {