diff options
| author | 2023-04-14 14:54:16 +0000 | |
|---|---|---|
| committer | 2023-04-17 00:08:57 +0000 | |
| commit | 272d3fb6e676510ca2f91b521f160a24d8aff09c (patch) | |
| tree | e113f2ada2725f636ab6f215534b848a5f8e6263 | |
| parent | 877d6d061b806bc8e5524725eac91e8a5fa45bc1 (diff) | |
DO NOT MERGE Revert "Accept a Window as shown if it's in any transition"
This reverts commit 8ed3e4a826356b5e93008653d310844ea9d4d8e5.
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
| -rw-r--r-- | services/core/java/com/android/server/wm/WindowState.java | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/services/core/java/com/android/server/wm/WindowState.java b/services/core/java/com/android/server/wm/WindowState.java index 2d21e710bca8..95fea0ee22f5 100644 --- a/services/core/java/com/android/server/wm/WindowState.java +++ b/services/core/java/com/android/server/wm/WindowState.java @@ -2053,19 +2053,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() { |