Merge "Allow performShowLocked when transition animation started" into nyc-mr1-dev

2016-08-15 19:04:47 +00:00
parent 45d2ff9b6a 83caa366f4
commit 1fb9466c1d
1 changed files with 2 additions and 1 deletions
--- a/services/core/java/com/android/server/wm/WindowState.java
+++ b/services/core/java/com/android/server/wm/WindowState.java
@@ -1334,7 +1334,8 @@ final class WindowState implements WindowManagerPolicy.WindowState {
                && ((!mAttachedHidden && mViewVisibility == View.VISIBLE && !mRootToken.hidden)
                        || mWinAnimator.mAnimation != null
                        || ((atoken != null) && (atoken.mAppAnimator.animation != null)
-                                && !mWinAnimator.isDummyAnimation()));
+                                && !mWinAnimator.isDummyAnimation())
+                        || isAnimatingWithSavedSurface());
    }

    /**