Merge "Take fixed rotation into account when setting the rounded corn…

…er frame" into main
MinatiScape · Jun 13, 2024 · 2b683b7 · 2b683b7
2 parents feed17b + 1223a7a
commit 2b683b7
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/services/core/java/com/android/server/wm/InsetsPolicy.java b/services/core/java/com/android/server/wm/InsetsPolicy.java
@@ -424,7 +424,9 @@ private InsetsState adjustInsetsForRoundedCorners(WindowToken token, InsetsState
                 // Use task bounds to calculating rounded corners if the task is not floating.
                 final InsetsState state = copyState ? new InsetsState(originalState)
                         : originalState;
-                state.setRoundedCornerFrame(task.getBounds());
+                state.setRoundedCornerFrame(token.isFixedRotationTransforming()
+                        ? token.getFixedRotationTransformDisplayBounds()
+                        : task.getBounds());
                 return state;
             }
         }