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/LayerLifecycleManagerTest.cpp

diff --git a/services/surfaceflinger/tests/unittests/LayerLifecycleManagerTest.cpp b/services/surfaceflinger/tests/unittests/LayerLifecycleManagerTest.cpp
index 158db75..cfc8e99 100644
--- a/services/surfaceflinger/tests/unittests/LayerLifecycleManagerTest.cpp
+++ b/services/surfaceflinger/tests/unittests/LayerLifecycleManagerTest.cpp
@@ -462,8 +462,7 @@
                                                                GRALLOC_USAGE_PROTECTED /*usage*/));
     EXPECT_EQ(mLifecycleManager.getGlobalChanges().get(),
               ftl::Flags<RequestedLayerState::Changes>(
-                      RequestedLayerState::Changes::Buffer | RequestedLayerState::Changes::Content |
-                      RequestedLayerState::Changes::RequiresComposition)
+                      RequestedLayerState::Changes::Buffer | RequestedLayerState::Changes::Content)
                       .get());
     mLifecycleManager.commitChanges();
 
@@ -497,8 +496,7 @@
               ftl::Flags<RequestedLayerState::Changes>(
                       RequestedLayerState::Changes::Buffer | RequestedLayerState::Changes::Content |
                       RequestedLayerState::Changes::VisibleRegion |
-                      RequestedLayerState::Changes::Visibility |
-                      RequestedLayerState::Changes::RequiresComposition)
+                      RequestedLayerState::Changes::Visibility)
                       .get());
     mLifecycleManager.commitChanges();
 }
@@ -522,8 +520,7 @@
                       RequestedLayerState::Changes::AffectsChildren |
                       RequestedLayerState::Changes::Content |
                       RequestedLayerState::Changes::Geometry |
-                      RequestedLayerState::Changes::VisibleRegion |
-                      RequestedLayerState::Changes::RequiresComposition)
+                      RequestedLayerState::Changes::VisibleRegion)
                       .get());
     mLifecycleManager.commitChanges();
 }
@@ -541,8 +538,7 @@
               ftl::Flags<RequestedLayerState::Changes>(
                       RequestedLayerState::Changes::Content |
                       RequestedLayerState::Changes::AffectsChildren |
-                      RequestedLayerState::Changes::VisibleRegion |
-                      RequestedLayerState::Changes::RequiresComposition)
+                      RequestedLayerState::Changes::VisibleRegion)
                       .string());
     EXPECT_EQ(mLifecycleManager.getChangedLayers()[0]->color.a, static_cast<half>(startingAlpha));
     mLifecycleManager.commitChanges();
@@ -555,8 +551,7 @@
               ftl::Flags<RequestedLayerState::Changes>(
                       RequestedLayerState::Changes::Content |
                       RequestedLayerState::Changes::AffectsChildren |
-                      RequestedLayerState::Changes::VisibleRegion |
-                      RequestedLayerState::Changes::RequiresComposition)
+                      RequestedLayerState::Changes::VisibleRegion)
                       .string());
     EXPECT_EQ(mLifecycleManager.getChangedLayers()[0]->color.a, static_cast<half>(endingAlpha));
     mLifecycleManager.commitChanges();
@@ -586,8 +581,7 @@
                                                             GRALLOC_USAGE_SW_READ_NEVER /*usage*/));
     EXPECT_EQ(mLifecycleManager.getGlobalChanges().get(),
               ftl::Flags<RequestedLayerState::Changes>(
-                      RequestedLayerState::Changes::Buffer | RequestedLayerState::Changes::Content |
-                      RequestedLayerState::Changes::RequiresComposition)
+                      RequestedLayerState::Changes::Buffer | RequestedLayerState::Changes::Content)
                       .get());
     mLifecycleManager.commitChanges();