Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1fb9466c authored by Chong Zhang's avatar Chong Zhang Committed by Android (Google) Code Review
Browse files

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

parents 45d2ff9b 83caa366

services/core/java/com/android/server/wm/WindowState.java

+2 −1
Original line number Diff line number Diff line
@@ -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());

    }



    /**