commit 0c689ef773bf4464172db1ddab40887f3c840f1a
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Oct 27 11:21:46 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Oct 27 11:21:46 2021 +0000
tree 7b2dc69bb216f422b8e568d69ada6a7a8481ad6d
parent c6bdd9243ae10e01d28a9d8c0d24406fb5fd0d07
parent 920be89b264993aaff95469799b7b9b5470265cf

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

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