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

Commit fda36ae5 authored by Ikram Gabiyev's avatar Ikram Gabiyev Committed by Android (Google) Code Review
Browse files

Merge "[PiP2] Start with non-null pip params" into main

parents 3989e8f6 17262154

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

+3 −1
Original line number Original line Diff line number Diff line
@@ -400,7 +400,9 @@ public class PipTransition extends PipTransitionController implements 
        final SurfaceControl pipLeash = getLeash(pipChange);

        final SurfaceControl pipLeash = getLeash(pipChange);

        final Rect startBounds = pipChange.getStartAbsBounds();

        final Rect startBounds = pipChange.getStartAbsBounds();

        final Rect endBounds = pipChange.getEndAbsBounds();

        final Rect endBounds = pipChange.getEndAbsBounds();

        final PictureInPictureParams params = pipChange.getTaskInfo().pictureInPictureParams;

        final PictureInPictureParams params = pipChange.getTaskInfo().pictureInPictureParams != null

                ? pipChange.getTaskInfo().pictureInPictureParams

                : new PictureInPictureParams.Builder().build();

        final Rect adjustedSourceRectHint = getAdjustedSourceRectHint(info, pipChange,

        final Rect adjustedSourceRectHint = getAdjustedSourceRectHint(info, pipChange,

                pipActivityChange);

                pipActivityChange);