Commit db1612e3 authored Jun 26, 2020 by Winson Chung Committed by Automerger Merge Worker Jun 26, 2020

Merge "Fix issue with invalid aspect ratio causing issues resizing" into...

Merge "Fix issue with invalid aspect ratio causing issues resizing" into rvc-dev am: f8fe1d97 am: 9c480bce

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12000451

Change-Id: I2d069216ff168b611184a50aa04c7fa98ec55891

packages/SystemUI/src/com/android/systemui/pip/PipTaskOrganizer.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -819,7 +819,7 @@ public class PipTaskOrganizer extends TaskOrganizer implements
		}

		private float getAspectRatioOrDefault(@Nullable PictureInPictureParams params) {
		return params == null
		return params == null \|\| !params.hasSetAspectRatio()
		? mPipBoundsHandler.getDefaultAspectRatio()
		: params.getAspectRatio();
		}