Merge "WindowState isSyncFinished should also check isVisibleRequested" into sc-v2-dev

This commit is contained in:
Wei Sheng Shih
2021-10-19 12:37:41 +00:00
committed by Android (Google) Code Review

View File

@@ -6050,7 +6050,8 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP
@Override @Override
boolean isSyncFinished() { 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 // 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. // becomes un-gone while the syncset is still active.
return true; return true;