Merge "Merge "Fix main stage full screen after lock phone" into sc-v2-dev am:... (0627a1dd) · Commits · e / os / android_frameworks_base

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -526,9 +526,10 @@ class StageCoordinator implements SplitLayout.SplitLayoutHandler,
		// visible.
		mMainStage.updateConfiguration(
		WINDOWING_MODE_MULTI_WINDOW, getMainStageBounds(), wct);
		} else {
		} else if (!mSideStage.mRootTaskInfo.isSleeping) {
		// We want the main stage configuration to be fullscreen when the side stage isn't
		// visible.
		// We should not do it when side stage are not visible due to sleeping display too.
		mMainStage.updateConfiguration(WINDOWING_MODE_FULLSCREEN, null, wct);
		}
		// TODO: Change to `mSyncQueue.queue(wct)` once BLAST is stable.