commit 8930cbaf52b9576dc9c27142a8734a02134b6389
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Oct 27 11:41:16 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Oct 27 11:41:16 2021 +0000
tree fc1ae07e90a68119bf647f6bb2413b948cc35217
parent 0c79597c9c3e647bec7f103082ceff7a2cfec453
parent 0c689ef773bf4464172db1ddab40887f3c840f1a

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

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

Change-Id: I04c5afea5e58038823d207e36103e816f4040760

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();
             }