Merge "[PiP2] Don't update display layout for same id" into main (9c43d833) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/src/com/android/wm/shell/pip2/phone/PipTransition.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -728,7 +728,8 @@ public class PipTransition extends PipTransitionController implements

		// If PiP is enabled on Connected Displays, update PipDisplayLayoutState to have the correct
		// display info that PiP is entering in.
		if (mPipDesktopState.isConnectedDisplaysPipEnabled()) {
		if (mPipDesktopState.isConnectedDisplaysPipEnabled()
		&& pipTask.displayId != mPipDisplayLayoutState.getDisplayId()) {
		final DisplayLayout displayLayout = mDisplayController.getDisplayLayout(
		pipTask.displayId);
		if (displayLayout != null) {