Commit 79a8e2be authored Aug 13, 2024 by Ikram Gabiyev

Update the PiP ActivityRecord with new PiP params

We need to take into account PictureInPictureParams potentially
sent to us from the client through enterPictureInPictureMode()
directly in PiP2 as well. (along with setPictureInPictureParams)

This issue has been causing some of the enter PiP CTS test cases
that were passing in custom aspect ratios.

Bug: 359652602
Flag: com.android.wm.shell.enable_pip2_implementation
Test: atest PinnedStackTests#testEnterPipAspectRatioMax
Test: atest PinnedStackTests#testEnterPipAspectRatioMin
Test: atest PinnedStackTests#testSetPipExtremeAspectRatioMax
Test: atest PinnedStackTests#testSetPipExtremeAspectRatioMin
Test: atest PinnedStackTests#testResizePipAspectRatioMax
Test: atest PinnedStackTests#testResizePipAspectRatioMin
Change-Id: I0cd5fcc45022471c0c964dbdc77beff567cde806

parent ddbbcaed

services/core/java/com/android/server/wm/ActivityTaskManagerService.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -3754,6 +3754,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {
		// Shell calls back into Core with the entry bounds to be applied with startWCT.
		final Transition enterPipTransition = new Transition(TRANSIT_PIP,
		0 /* flags */, getTransitionController(), mWindowManager.mSyncEngine);
		r.setPictureInPictureParams(params);
		enterPipTransition.setPipActivity(r);
		r.mAutoEnteringPip = isAutoEnter;
		getTransitionController().startCollectOrQueue(enterPipTransition, (deferred) -> {