commit 98db9577c10dab501a12d55382e1e29bf4b4e58e
author Vishnu Nair <vishnun@google.com> Tue May 18 23:16:37 2021 +0000
committer Ady Abraham <adyabr@google.com> Tue Jun 08 19:11:09 2021 +0000
tree d66bd91347d63d303e0d4b47db0e126be2275ade
parent 9d7aee1d786b01942e90cb6972b2bc1e06920aef

Clear mForceTraversal

Fixes regression from 6bdec7d9c62ed47f9fd0e0cb9e59f0cbe48b4bae

Change-Id: I839682e5daa407994de3714803e1e92c0bbbc4fe
Merged-In: I839682e5daa407994de3714803e1e92c0bbbc4fe
Test: go/wm-smoke
Fixes: 188546439
Bug: 190472229
(cherry picked from commit 05fc88302dee5dcd6b0960005789c4214d32c30d)

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 2b4f9ef..afc0ac2 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -2894,6 +2894,7 @@
     // Commit layer transactions. This needs to happen after display transactions are
     // committed because some geometry logic relies on display orientation.
     if ((transactionFlags & eTraversalNeeded) || mForceTraversal || displayTransactionNeeded) {
+        mForceTraversal = false;
         mCurrentState.traverse([&](Layer* layer) {
             uint32_t trFlags = layer->getTransactionFlags(eTransactionNeeded);
             if (!trFlags && !displayTransactionNeeded) return;