diff --git a/services/core/java/com/android/server/wm/WindowContainer.java b/services/core/java/com/android/server/wm/WindowContainer.java index 51ecce0ec9ecc..ac9f924e345a7 100644 --- a/services/core/java/com/android/server/wm/WindowContainer.java +++ b/services/core/java/com/android/server/wm/WindowContainer.java @@ -939,21 +939,6 @@ class WindowContainer extends ConfigurationContainer< return getAnimatingContainer(flags, typesToCheck) != null; } - /** - * Similar to {@link #isAnimating(int, int)} except provide a bitmask of - * {@link AnimationType} to exclude, rather than include - * @param flags The combination of bitmask flags to specify targets and condition for - * checking animating status. - * @param typesToExclude The combination of bitmask {@link AnimationType} to exclude when - * checking if animating. - * - * @deprecated Use {@link #isAnimating(int, int)} - */ - @Deprecated - final boolean isAnimatingExcluding(int flags, int typesToExclude) { - return isAnimating(flags, ANIMATION_TYPE_ALL & ~typesToExclude); - } - /** * @deprecated Use {@link #isAnimating(int, int)} * TODO (b/152333373): Migrate calls to use isAnimating with specified animation type diff --git a/services/tests/wmtests/src/com/android/server/wm/WindowContainerTests.java b/services/tests/wmtests/src/com/android/server/wm/WindowContainerTests.java index bbeb980353edf..db7def82d99cf 100644 --- a/services/tests/wmtests/src/com/android/server/wm/WindowContainerTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/WindowContainerTests.java @@ -43,6 +43,7 @@ import static com.android.dx.mockito.inline.extended.ExtendedMockito.spyOn; import static com.android.dx.mockito.inline.extended.ExtendedMockito.times; import static com.android.dx.mockito.inline.extended.ExtendedMockito.verify; import static com.android.server.wm.DisplayArea.Type.ANY; +import static com.android.server.wm.SurfaceAnimator.ANIMATION_TYPE_ALL; import static com.android.server.wm.SurfaceAnimator.ANIMATION_TYPE_APP_TRANSITION; import static com.android.server.wm.SurfaceAnimator.ANIMATION_TYPE_SCREEN_ROTATION; import static com.android.server.wm.WindowContainer.AnimationFlags.CHILDREN; @@ -442,7 +443,7 @@ public class WindowContainerTests extends WindowTestsBase { assertTrue(window.isAnimating()); assertFalse(window.isAnimating(0, ANIMATION_TYPE_SCREEN_ROTATION)); assertTrue(window.isAnimating(0, ANIMATION_TYPE_APP_TRANSITION)); - assertFalse(window.isAnimatingExcluding(0, ANIMATION_TYPE_APP_TRANSITION)); + assertFalse(window.isAnimating(0, ANIMATION_TYPE_ALL & ~ANIMATION_TYPE_APP_TRANSITION)); final TestWindowContainer child = window.addChildWindow(); assertFalse(child.isAnimating());