From 83caa366f40b29ae5c4fcb59f601802866d66012 Mon Sep 17 00:00:00 2001 From: Chong Zhang Date: Sun, 14 Aug 2016 18:47:54 -0700 Subject: [PATCH] Allow performShowLocked when transition animation started Some transitions can have no animation, in which case isReadyForDisplayIgnoringKeyguard() will wait for VIEW visibility to become VISIBLE. But if we have a saved surface, the transition could have already started. This causes exiting app to be hidden, while entering app's performShowLocked() still hold back waiting for the relayout to visible. If we started animating with saved surface, it should also count as transition animation started. b/30855380 Change-Id: I6260a323b48e57d8337267d9136f630226a48dc8 --- services/core/java/com/android/server/wm/WindowState.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/wm/WindowState.java b/services/core/java/com/android/server/wm/WindowState.java index a00ac5d5429ba..81545b6c1991d 100644 --- 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()); } /**