Merge "WindowState isSyncFinished should also check isVisibleRequested" into sc-v2-dev am: 1d0c96e853 am: adfa19fde5

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15993028

Change-Id: I82843d3b8b13e4278b5b025b02fdc445672b82e9
This commit is contained in:
Wei Sheng Shih
2021-10-19 13:12:08 +00:00
committed by Automerger Merge Worker

View File

@@ -5917,7 +5917,8 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP
@Override
boolean isSyncFinished() {
if (mSyncState == SYNC_STATE_WAITING_FOR_DRAW && mViewVisibility == View.GONE) {
if (mSyncState == SYNC_STATE_WAITING_FOR_DRAW && mViewVisibility == View.GONE
&& !isVisibleRequested()) {
// Don't wait for GONE windows. However, we don't alter the state in case the window
// becomes un-gone while the syncset is still active.
return true;