am 3fee3eb7: am 5beeb04b: Merge "Don\'t display based on a dummy animation." into jb-dev
* commit '3fee3eb7e0a83cd7fc8df3994692232ba6953c02':
Don't display based on a dummy animation.
diff --git a/services/java/com/android/server/wm/WindowState.java b/services/java/com/android/server/wm/WindowState.java
index 2b48783..a00e8a5 100644
--- a/services/java/com/android/server/wm/WindowState.java
+++ b/services/java/com/android/server/wm/WindowState.java
@@ -737,7 +737,8 @@
&& ((!mAttachedHidden && mViewVisibility == View.VISIBLE
&& !mRootToken.hidden)
|| mWinAnimator.mAnimation != null
- || ((atoken != null) && (atoken.mAppAnimator.animation != null)));
+ || ((atoken != null) && (atoken.mAppAnimator.animation != null)
+ && !mWinAnimator.isDummyAnimation()));
}
/**