Apply animation in relayout invisible the old way

We skipped the applyAnimationLocked to work around a problem with
cached animation loading, however app could be animating without
window animator (only app animator) in which case we shouldn't do
the relayout for potential focus change.

Revert to the old behavior and let applyAnimationLocked decide if
we want to relayout for focus change.

bug: 29874980
Change-Id: I6fdfbe41cbafd7017477c0eda9b4fd26e66c517f

1 files changed, 1 insertions, 2 deletions

diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java
index 84173d26ef8b..4083ba699de0 100644
--- a/services/core/java/com/android/server/wm/WindowManagerService.java
+++ b/services/core/java/com/android/server/wm/WindowManagerService.java
@@ -3003,8 +3003,7 @@ public class WindowManagerService extends IWindowManager.Stub
         if (win.mAttrs.type == TYPE_APPLICATION_STARTING) {
             transit = WindowManagerPolicy.TRANSIT_PREVIEW_DONE;
         }
-        if (win.isWinVisibleLw() && (winAnimator.isAnimationSet() ||
-                winAnimator.applyAnimationLocked(transit, false))) {
+        if (win.isWinVisibleLw() && winAnimator.applyAnimationLocked(transit, false)) {
             focusMayChange = isDefaultDisplay;
             win.mAnimatingExit = true;
             win.mWinAnimator.mAnimating = true;