Skip to content

Commit 272d3fb

Browse files
hex539Android Build Coastguard Worker
authored andcommitted
DO NOT MERGE Revert "Accept a Window as shown if it's in any transition"
This reverts commit 8ed3e4a. Reason for revert: Task embedding flicker b/276472426 Fix: 276472426 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:dd2ba83f7921f070ceee53a795a17c0a8127c266) Merged-In: I81a41081ff5905cba35930f1a0de04c2000b5dfa Change-Id: I81a41081ff5905cba35930f1a0de04c2000b5dfa
1 parent 877d6d0 commit 272d3fb

1 file changed

Lines changed: 4 additions & 7 deletions

File tree

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

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2053,19 +2053,16 @@ boolean isInteresting() {
20532053

20542054
/**
20552055
* Like isOnScreen(), but we don't return true if the window is part
2056-
* of a transition but has not yet started animating.
2056+
* of a transition that has not yet been started.
20572057
*/
20582058
boolean isReadyForDisplay() {
2059-
if (!mHasSurface || mDestroying || !isVisibleByPolicy()) {
2060-
return false;
2061-
}
2062-
if (mToken.waitingToShow && getDisplayContent().mAppTransition.isTransitionSet()
2063-
&& !isAnimating(TRANSITION | PARENTS, ANIMATION_TYPE_APP_TRANSITION)) {
2059+
if (mToken.waitingToShow && getDisplayContent().mAppTransition.isTransitionSet()) {
20642060
return false;
20652061
}
20662062
final boolean parentAndClientVisible = !isParentWindowHidden()
20672063
&& mViewVisibility == View.VISIBLE && mToken.isVisible();
2068-
return parentAndClientVisible || isAnimating(TRANSITION | PARENTS, ANIMATION_TYPE_ALL);
2064+
return mHasSurface && isVisibleByPolicy() && !mDestroying
2065+
&& (parentAndClientVisible || isAnimating(TRANSITION | PARENTS));
20692066
}
20702067

20712068
boolean isFullyTransparent() {

0 commit comments

Comments
 (0)