Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d888e771 authored by Andras Kloczl's avatar Andras Kloczl
Browse files

Fix crash when hotseat icon is dragged onto Workspace 

Test: manual
Bug: 198820019
Change-Id: I53bb858feb7aad45472803b133ef3d026dd9f319
parent 69fd5cb9

src/com/android/launcher3/Workspace.java

+2 −1
Original line number Diff line number Diff line
@@ -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) {