From b9a368df591d81a3acb6deabd015f1be382cdf3f Mon Sep 17 00:00:00 2001
From: Evan Rosky <erosky@google.com>
Date: Tue, 21 Sep 2021 14:28:00 -0700
Subject: [PATCH] Fix test failure due to hanging layout

Moved postdrawtransaction application to layout pass, but didn't
set layoutNeeded.

Bug: 200134598
Test: atest MagnifierTest
Change-Id: Ic1be2db52469645d4da12c449c3e13cdb746e7ee
---
 .../core/java/com/android/server/wm/WindowStateAnimator.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/wm/WindowStateAnimator.java b/services/core/java/com/android/server/wm/WindowStateAnimator.java
index dd70a14bd1ce9..d4d897177cb4e 100644
--- 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;