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: I58e30cb563bfa92c4c48c356584a541bc2b5d12a
This commit is contained in:
@@ -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();
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user