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

Commit 34a07f43 authored by Winson Chung's avatar Winson Chung
Browse files

Fix regression in rotation rect being clobbered. 

- We should not be using the tmp rect as it's already being used
  by the caller in onTaskStackBoundsChanged().

Test: Rotate device while PiP is up.
Change-Id: I826f6379666c72be505185cd0c101b18a8277177
parent 1f1416e5

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);