From 1e260d8b89ce2e820e66dc74b4342fd8708792ec Mon Sep 17 00:00:00 2001
From: Kazuki Takise <takise@google.com>
Date: Sat, 26 Nov 2022 09:01:12 +0900
Subject: [PATCH] Use resolved configuration for shell transit clip rect

Requested override configuration can be adjusted in Core when some
policies such as task min size are applied.

Bug: 185427982
Test: SplashScreenTests#testSetBackgroundColorActivity_FreeformWindow
Change-Id: If9fb9e26fff9cfe448e0b8fdd87e13429ec63f87
---
 services/core/java/com/android/server/wm/Transition.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/services/core/java/com/android/server/wm/Transition.java b/services/core/java/com/android/server/wm/Transition.java
index b6e52aaff035b..6fe9c14706a76 100644
--- a/services/core/java/com/android/server/wm/Transition.java
+++ b/services/core/java/com/android/server/wm/Transition.java
@@ -626,8 +626,8 @@ class Transition extends Binder implements BLASTSyncEngine.TransactionReadyListe
                 if (target.asDisplayContent() != null || target.asActivityRecord() != null) {
                     t.setCrop(targetLeash, null /* crop */);
                 } else {
-                    // Crop to the requested bounds.
-                    final Rect clipRect = target.getRequestedOverrideBounds();
+                    // Crop to the resolved override bounds.
+                    final Rect clipRect = target.getResolvedOverrideBounds();
                     t.setWindowCrop(targetLeash, clipRect.width(), clipRect.height());
                 }
                 t.setCornerRadius(targetLeash, 0);