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

Commit ce10de79 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents 13e121e3 d888e771

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