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

Commit 3389df71 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix regression in rotation rect being clobbered."

parents a654fdd2 34a07f43

services/core/java/com/android/server/wm/PinnedStackController.java

+2 −1
Original line number Original line Diff line number Diff line
@@ -108,6 +108,7 @@ class PinnedStackController { 
    private final DisplayMetrics mTmpMetrics = new DisplayMetrics();

    private final DisplayMetrics mTmpMetrics = new DisplayMetrics();

    private final Rect mTmpInsets = new Rect();

    private final Rect mTmpInsets = new Rect();

    private final Rect mTmpRect = new Rect();

    private final Rect mTmpRect = new Rect();

    private final Rect mTmpAnimatingBoundsRect = new Rect();

    private final Point mTmpDisplaySize = new Point();

    private final Point mTmpDisplaySize = new Point();





    /**

    /**
@@ -359,7 +360,7 @@ class PinnedStackController { 
                if (isValidPictureInPictureAspectRatio(mAspectRatio)) {

                if (isValidPictureInPictureAspectRatio(mAspectRatio)) {

                    transformBoundsToAspectRatio(normalBounds, mAspectRatio);

                    transformBoundsToAspectRatio(normalBounds, mAspectRatio);

                }

                }

                final Rect animatingBounds = mTmpRect;

                final Rect animatingBounds = mTmpAnimatingBoundsRect;

                final TaskStack pinnedStack = mDisplayContent.getStackById(PINNED_STACK_ID);

                final TaskStack pinnedStack = mDisplayContent.getStackById(PINNED_STACK_ID);

                if (pinnedStack != null) {

                if (pinnedStack != null) {

                    pinnedStack.getAnimatingBounds(animatingBounds);

                    pinnedStack.getAnimatingBounds(animatingBounds);