Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8975d9a0 authored Apr 05, 2023 by Mateusz Cicheński Committed by Android (Google) Code Review Apr 05, 2023

Merge "Validate aspect ratio on PiP params change." into tm-qpr-dev

parents 66232edf 86edc8c5

libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipBoundsAlgorithm.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -198,7 +198,7 @@ public class PipBoundsAlgorithm {
		/**
		* @return whether the given {@param aspectRatio} is valid.
		*/
		private boolean isValidPictureInPictureAspectRatio(float aspectRatio) {
		public boolean isValidPictureInPictureAspectRatio(float aspectRatio) {
		return Float.compare(mMinAspectRatio, aspectRatio) <= 0
		&& Float.compare(aspectRatio, mMaxAspectRatio) <= 0;
		}

libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java

+10 −1

Original line number	Diff line number	Diff line
		@@ -1230,7 +1230,16 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener,
		protected void applyNewPictureInPictureParams(@NonNull PictureInPictureParams params) {
		if (mDeferredTaskInfo != null \|\| PipUtils.aspectRatioChanged(params.getAspectRatioFloat(),
		mPictureInPictureParams.getAspectRatioFloat())) {
		if (mPipBoundsAlgorithm.isValidPictureInPictureAspectRatio(
		params.getAspectRatioFloat())) {
		mPipParamsChangedForwarder.notifyAspectRatioChanged(params.getAspectRatioFloat());
		} else {
		ProtoLog.d(ShellProtoLogGroup.WM_SHELL_PICTURE_IN_PICTURE,
		"%s: New aspect ratio is not valid."
		+ " hasAspectRatio=%b"
		+ " aspectRatio=%f",
		TAG, params.hasSetAspectRatio(), params.getAspectRatioFloat());
		}
		}
		if (mDeferredTaskInfo != null
		\|\| PipUtils.remoteActionsChanged(params.getActions(),