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

Commit a8dacb88 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Clean up IllegalStateException for page pairing" into sc-v2-dev am:... 

Merge "Clean up IllegalStateException for page pairing" into sc-v2-dev am: 0c689ef7 am: 25c40cb0

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

Change-Id: If34f3ef5902eca2710f5cd49097d185c4d1010b3
parents 387c3fb2 25c40cb0

src/com/android/launcher3/Workspace.java

+0 −8
Original line number Diff line number Diff line
@@ -651,14 +651,6 @@ public class Workspace extends PagedView<WorkspacePageIndicator> 
            if (isTwoPanelEnabled() && !(mDragSourceInternal.getParent() instanceof Hotseat)) {

                int pagePairScreenId = getScreenPair(dragObject.dragInfo.screenId);

                CellLayout pagePair = mWorkspaceScreens.get(pagePairScreenId);

                if (pagePair == null) {

                    // TODO: after http://b/198820019 is fixed, remove this

                    throw new IllegalStateException("Page pair is null, "

                            + "dragScreenId: " + dragObject.dragInfo.screenId

                            + ", pagePairScreenId: " + pagePairScreenId

                            + ", mScreenOrder: " + mScreenOrder.toConcatString()

                    );

                }

                dragSourceChildCount += pagePair.getShortcutsAndWidgets().getChildCount();

            }