Merge "Fix failed while running same pair again" into tm-qpr-dev (9e656e7c) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1613,7 +1613,7 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler,
	mSplitLayout.flingDividerToDismiss(		mSplitLayout.flingDividerToDismiss(
	mSideStagePosition != SPLIT_POSITION_BOTTOM_OR_RIGHT,		mSideStagePosition != SPLIT_POSITION_BOTTOM_OR_RIGHT,
	EXIT_REASON_APP_FINISHED);		EXIT_REASON_APP_FINISHED);
	} else if (!isSplitScreenVisible()) {		} else if (!isSplitScreenVisible() && !mIsSplitEntering) {
	exitSplitScreen(null /* childrenToTop */, EXIT_REASON_APP_FINISHED);		exitSplitScreen(null /* childrenToTop */, EXIT_REASON_APP_FINISHED);
	}		}
	} else if (isSideStage && hasChildren && !mMainStage.isActive()) {		} else if (isSideStage && hasChildren && !mMainStage.isActive()) {