Merge "Fix failed while running same pair again" into tm-qpr-dev am: 9e656e7c3c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20742170 Change-Id: I41cee4f86de6d701b19cfc6be2ce23894bcabdb4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -1613,7 +1613,7 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler,
|
||||
mSplitLayout.flingDividerToDismiss(
|
||||
mSideStagePosition != SPLIT_POSITION_BOTTOM_OR_RIGHT,
|
||||
EXIT_REASON_APP_FINISHED);
|
||||
} else if (!isSplitScreenVisible()) {
|
||||
} else if (!isSplitScreenVisible() && !mIsSplitEntering) {
|
||||
exitSplitScreen(null /* childrenToTop */, EXIT_REASON_APP_FINISHED);
|
||||
}
|
||||
} else if (isSideStage && hasChildren && !mMainStage.isActive()) {
|
||||
|
||||
Reference in New Issue
Block a user