commit 6846ade9aab98df8bb186f2d256349131e79945a
author Ady Abraham <adyabr@google.com> Mon May 20 21:58:27 2024 +0000
committer Ady Abraham <adyabr@google.com> Mon May 20 22:30:53 2024 +0000
tree b7dead416a8d57eaf2b2c38db4d4babda00549e8
parent dba72f5654f6cb489e500d96ce1317e083da85aa

SF: partially revert df59f4744c0672cc69dad72b230a757c1e4be116

Avoid a composition cycle when the FrameRate votes updates,
but keep the old behavior for all other cases.

Bug: 339759346
Change-Id: Ic0696ddeee6ed10f1e6efcc0dbe9589d638900cd
Test: android.platform.test.scenario.gmail.OpenCloseComposeEmailMicrobenchmark#testOpenCloseComposeEmail

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 28d8018..e2af5cf 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -2447,8 +2447,8 @@
     }
     outTransactionsAreEmpty = mLayerLifecycleManager.getGlobalChanges().get() == 0;
     if (FlagManager::getInstance().vrr_bugfix_24q4()) {
-        mustComposite |= mLayerLifecycleManager.getGlobalChanges().test(
-                frontend::RequestedLayerState::Changes::RequiresComposition);
+        mustComposite |= mLayerLifecycleManager.getGlobalChanges().any(
+                frontend::RequestedLayerState::kMustComposite);
     } else {
         mustComposite |= mLayerLifecycleManager.getGlobalChanges().get() != 0;
     }