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

Commit b75186ff authored by David Lin's avatar David Lin Committed by Android (Google) Code Review
Browse files

Merge "Apply PictureInPictureParam only if it's changed" into 24D1-dev

parents 86c54353 5a70b445

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())) {