Merge \\"Apply animation in relayout invisible the old way\\" into nyc-mr1-dev am: 8f54d32b99

am: 8ca3333d90

Change-Id: Iaa6f622142eab1454d5bd769a532f010d4509078

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 b36575f39646..acc36591c51b 100644
--- a/services/core/java/com/android/server/wm/WindowManagerService.java
+++ b/services/core/java/com/android/server/wm/WindowManagerService.java
@@ -3009,8 +3009,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;