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/tests/unittests/LayerSnapshotTest.cpp

diff --git a/services/surfaceflinger/tests/unittests/LayerSnapshotTest.cpp b/services/surfaceflinger/tests/unittests/LayerSnapshotTest.cpp
index ce4d798..23b6851 100644
--- a/services/surfaceflinger/tests/unittests/LayerSnapshotTest.cpp
+++ b/services/surfaceflinger/tests/unittests/LayerSnapshotTest.cpp
@@ -255,8 +255,7 @@
     setColor(11, {1._hf, 0._hf, 0._hf});
     UPDATE_AND_VERIFY(mSnapshotBuilder, STARTING_ZORDER);
     EXPECT_EQ(getSnapshot(11)->changes,
-              RequestedLayerState::Changes::Content |
-                      RequestedLayerState::Changes::RequiresComposition);
+              RequestedLayerState::Changes::Content);
     EXPECT_EQ(getSnapshot(11)->clientChanges, layer_state_t::eColorChanged);
     EXPECT_EQ(getSnapshot(1)->changes.get(), 0u);
     UPDATE_AND_VERIFY(mSnapshotBuilder, STARTING_ZORDER);
@@ -267,8 +266,7 @@
     setColor(1, {1._hf, 0._hf, 0._hf});
     UPDATE_AND_VERIFY(mSnapshotBuilder, STARTING_ZORDER);
     EXPECT_EQ(getSnapshot(1)->changes,
-              RequestedLayerState::Changes::Content |
-                      RequestedLayerState::Changes::RequiresComposition);
+              RequestedLayerState::Changes::Content);
     EXPECT_EQ(getSnapshot(1)->clientChanges, layer_state_t::eColorChanged);
 }