From 84dedaffac0640322a17f2e2d4ce0fd8d281d112 Mon Sep 17 00:00:00 2001
From: Jacqueline Bronger <bronger@google.com>
Date: Thu, 24 Mar 2022 16:09:08 +0100
Subject: [PATCH] Fix orientation change between PiPs when collapsed

Bug: 226571625
Fixes: 226571625
Test: manual - open vertical expanded PiP, close PiP, open horizontal
expanded PiP

Change-Id: I574e53d496b9b03539970f380b4ee1a5ec5d36fc
---
 .../src/com/android/wm/shell/pip/tv/TvPipBoundsAlgorithm.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/tv/TvPipBoundsAlgorithm.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/tv/TvPipBoundsAlgorithm.java
index d6dacd14f5364..40a5ae3313ec9 100644
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/tv/TvPipBoundsAlgorithm.java
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/tv/TvPipBoundsAlgorithm.java
@@ -95,10 +95,10 @@ public class TvPipBoundsAlgorithm extends PipBoundsAlgorithm {
             ProtoLog.d(ShellProtoLogGroup.WM_SHELL_PICTURE_IN_PICTURE,
                     "%s: getEntryDestinationBounds()", TAG);
         }
+        updateExpandedPipSize();
         if (mTvPipBoundsState.isTvExpandedPipSupported()
                 && mTvPipBoundsState.getDesiredTvExpandedAspectRatio() != 0
                 && !mTvPipBoundsState.isTvPipManuallyCollapsed()) {
-            updateExpandedPipSize();
             updateGravityOnExpandToggled(Gravity.NO_GRAVITY, true);
             mTvPipBoundsState.setTvPipExpanded(true);
         }