commit d888e77145490d1a377a2caaaeeecbc4dc99603b
author Andras Kloczl <andraskloczl@google.com> Mon Sep 06 16:43:01 2021 +0100
committer Andras Kloczl <andraskloczl@google.com> Mon Sep 06 16:43:01 2021 +0100
tree 322461991da85f102aa29027338b55b6dbd926b3
parent 69fd5cb9596cfbe467194b92fdeee7c7e0beb1dd

Fix crash when hotseat icon is dragged onto Workspace

Test: manual
Bug: 198820019
Change-Id: I53bb858feb7aad45472803b133ef3d026dd9f319

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