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

Commit 2ec2440b authored by Hongwei Wang's avatar Hongwei Wang Committed by Android (Google) Code Review
Browse files

Merge "Apply PictureInPictureParam only if it's changed" into main

parents 9b15205c 33eb97af

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

+2 −3
Original line number Diff line number Diff line
@@ -1368,7 +1368,7 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener, 
     * Handles all changes to the PictureInPictureParams.

     */

    protected void applyNewPictureInPictureParams(@NonNull PictureInPictureParams params) {

        if (mDeferredTaskInfo != null || PipUtils.aspectRatioChanged(params.getAspectRatioFloat(),

        if (PipUtils.aspectRatioChanged(params.getAspectRatioFloat(),

                mPictureInPictureParams.getAspectRatioFloat())) {

            if (mPipBoundsAlgorithm.isValidPictureInPictureAspectRatio(

                    params.getAspectRatioFloat())) {
@@ -1381,8 +1381,7 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener, 
                        TAG, params.hasSetAspectRatio(), params.getAspectRatioFloat());

            }

        }

        if (mDeferredTaskInfo != null

                || PipUtils.remoteActionsChanged(params.getActions(),

        if (PipUtils.remoteActionsChanged(params.getActions(),

                mPictureInPictureParams.getActions())

                || !PipUtils.remoteActionsMatch(params.getCloseAction(),

                mPictureInPictureParams.getCloseAction())) {