commit a8dacb88e207647abd06f69ff67db453fff14529
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Oct 27 11:58:07 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Oct 27 11:58:07 2021 +0000
tree faae9cb6dde9032027e2d41ad656801198a5deeb
parent 387c3fb2c88e19c4433186e4bb977948858d9f67
parent 25c40cb0a8cac0dd2c37d1b6cb57493b1778658a

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

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

Change-Id: If34f3ef5902eca2710f5cd49097d185c4d1010b3

src/com/android/launcher3/Workspace.java

diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 8095280..fc717c9 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -651,14 +651,6 @@
             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();
             }