From 6103c92a56900a8a68ae8b2d3701da4688115254 Mon Sep 17 00:00:00 2001
From: chaviw <chaviw@google.com>
Date: Mon, 30 Mar 2020 14:56:54 -0700
Subject: [PATCH] Override base isAnimating in WindowState

WindowState overrides the isAnimating call. A new base method was added
to handle specific animation types, but the WindowState class was still
overriding the old isAnimating call. Therefore, the check for insets
provider was not handled.

Test: NexusLauncherTests
Fixes: 152657145
Change-Id: I32f5469fa992adb712779a6cb961bd3a1b44a227
---
 services/core/java/com/android/server/wm/WindowState.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/services/core/java/com/android/server/wm/WindowState.java b/services/core/java/com/android/server/wm/WindowState.java
index b87d18143fc7e..b386a7ae0a8ff 100644
--- a/services/core/java/com/android/server/wm/WindowState.java
+++ b/services/core/java/com/android/server/wm/WindowState.java
@@ -4981,7 +4981,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP
     }
 
     @Override
-    boolean isAnimating(int flags) {
+    boolean isAnimating(int flags, int typesToCheck) {
 
         // If we are an inset provider, all our animations are driven by the inset client, so we
         // aren't really animating.
@@ -4989,7 +4989,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP
         if (mControllableInsetProvider != null) {
             return false;
         }
-        return super.isAnimating(flags);
+        return super.isAnimating(flags, typesToCheck);
     }
 
     void startAnimation(Animation anim) {