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

Commit 0f554177 authored by Hiroshi Lockheimer's avatar Hiroshi Lockheimer Committed by Android Git Automerger
Browse files

am 3fee3eb7: am 5beeb04b: Merge "Don\'t display based on a dummy animation." into jb-dev 

* commit '3fee3eb7':
  Don't display based on a dummy animation.
parents 8411df2f 3fee3eb7

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

+2 −1
Original line number Diff line number Diff line
@@ -737,7 +737,8 @@ final class WindowState implements WindowManagerPolicy.WindowState { 
                && ((!mAttachedHidden && mViewVisibility == View.VISIBLE

                                && !mRootToken.hidden)

                        || mWinAnimator.mAnimation != null

                        || ((atoken != null) && (atoken.mAppAnimator.animation != null)));

                        || ((atoken != null) && (atoken.mAppAnimator.animation != null)

                                && !mWinAnimator.isDummyAnimation()));

    }



    /**