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

Commit dd2ba83f authored by Robin Lee's avatar Robin Lee Committed by Android (Google) Code Review
Browse files

DO NOT MERGE Revert "Accept a Window as shown if it's in any transition" 

This reverts commit 8ed3e4a8.

Reason for revert: Task embedding flicker b/276472426
Fix: 276472426

Change-Id: I81a41081ff5905cba35930f1a0de04c2000b5dfa
parent 8ed3e4a8

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

+4 −7
Original line number Diff line number Diff line
@@ -2049,19 +2049,16 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP 


    /**

     * Like isOnScreen(), but we don't return true if the window is part

     * of a transition but has not yet started animating.

     * of a transition that has not yet been started.

     */

    boolean isReadyForDisplay() {

        if (!mHasSurface || mDestroying || !isVisibleByPolicy()) {

            return false;

        }

        if (mToken.waitingToShow && getDisplayContent().mAppTransition.isTransitionSet()

                && !isAnimating(TRANSITION | PARENTS, ANIMATION_TYPE_APP_TRANSITION)) {

        if (mToken.waitingToShow && getDisplayContent().mAppTransition.isTransitionSet()) {

            return false;

        }

        final boolean parentAndClientVisible = !isParentWindowHidden()

                && mViewVisibility == View.VISIBLE && mToken.isVisible();

        return parentAndClientVisible || isAnimating(TRANSITION | PARENTS, ANIMATION_TYPE_ALL);

        return mHasSurface && isVisibleByPolicy() && !mDestroying

                && (parentAndClientVisible || isAnimating(TRANSITION | PARENTS));

    }



    boolean isFullyTransparent() {