Merge "Fix test failure due to hanging layout" into sc-v2-dev

2021-09-22 02:40:06 +00:00
parent dde5115d05 b9a368df59
commit 6d71d15808
1 changed files with 1 additions and 1 deletions
--- a/services/core/java/com/android/server/wm/WindowStateAnimator.java
+++ b/services/core/java/com/android/server/wm/WindowStateAnimator.java
@@ -250,10 +250,10 @@ class WindowStateAnimator {
            // away.
            if (mLastHidden && mDrawState != NO_SURFACE && !forceApplyNow) {
                mPostDrawTransaction.merge(postDrawTransaction);
-                layoutNeeded = true;
            } else {
                mWin.getSyncTransaction().merge(postDrawTransaction);
            }
+            layoutNeeded = true;
        }

        return layoutNeeded;