summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--core/java/android/window/flags/windowing_frontend.aconfig11
-rw-r--r--libs/WindowManager/Shell/src/com/android/wm/shell/transition/DefaultSurfaceAnimator.java3
2 files changed, 1 insertions, 13 deletions
diff --git a/core/java/android/window/flags/windowing_frontend.aconfig b/core/java/android/window/flags/windowing_frontend.aconfig
index 2f265926b9bb..816270235446 100644
--- a/core/java/android/window/flags/windowing_frontend.aconfig
+++ b/core/java/android/window/flags/windowing_frontend.aconfig
@@ -19,17 +19,6 @@ flag {
}
flag {
- name: "respect_animation_clip"
- namespace: "windowing_frontend"
- description: "Fix missing clip transformation of animation"
- bug: "376601866"
- is_fixed_read_only: true
- metadata {
- purpose: PURPOSE_BUGFIX
- }
-}
-
-flag {
name: "cache_window_style"
namespace: "windowing_frontend"
description: "Cache common window styles"
diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/transition/DefaultSurfaceAnimator.java b/libs/WindowManager/Shell/src/com/android/wm/shell/transition/DefaultSurfaceAnimator.java
index f5aaaad93229..ce98b03b77a6 100644
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/transition/DefaultSurfaceAnimator.java
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/transition/DefaultSurfaceAnimator.java
@@ -137,8 +137,7 @@ public class DefaultSurfaceAnimator {
if (mClipRect != null) {
boolean needCrop = false;
mAnimClipRect.set(mClipRect);
- if (transformation.hasClipRect()
- && com.android.window.flags.Flags.respectAnimationClip()) {
+ if (transformation.hasClipRect()) {
mAnimClipRect.intersectUnchecked(transformation.getClipRect());
needCrop = true;
}