commit d90ac11ceb4b16dfee7476f8963ff8ac7afce9bc
author Alec Mouri <alecmouri@google.com> Fri Nov 10 21:49:35 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Nov 10 21:49:35 2023 +0000
tree 201b6df18fcc9bfba9b65ff5bad3c9d349b78fc9
parent 8e084b1a7c67bb9c996ae72fb511553b155f7af4
parent d0f108ebb7b2b64d42dcd329c6773df0170060b5

Merge "Fix flattenLayers_ActiveLayersWithLowFpsAreFlattened" into main

services/surfaceflinger/CompositionEngine/tests/planner/FlattenerTest.cpp

diff --git a/services/surfaceflinger/CompositionEngine/tests/planner/FlattenerTest.cpp b/services/surfaceflinger/CompositionEngine/tests/planner/FlattenerTest.cpp
index 00590e6..d9318af 100644
--- a/services/surfaceflinger/CompositionEngine/tests/planner/FlattenerTest.cpp
+++ b/services/surfaceflinger/CompositionEngine/tests/planner/FlattenerTest.cpp
@@ -223,9 +223,6 @@
 }
 
 TEST_F(FlattenerTest, flattenLayers_ActiveLayersWithLowFpsAreFlattened) {
-    mTestLayers[0]->layerFECompositionState.fps = Flattener::kFpsActiveThreshold / 2;
-    mTestLayers[1]->layerFECompositionState.fps = Flattener::kFpsActiveThreshold;
-
     auto& layerState1 = mTestLayers[0]->layerState;
     auto& layerState2 = mTestLayers[1]->layerState;
 
@@ -235,6 +232,10 @@
     };
 
     initializeFlattener(layers);
+
+    mTestLayers[0]->layerFECompositionState.fps = Flattener::kFpsActiveThreshold / 2;
+    mTestLayers[1]->layerFECompositionState.fps = Flattener::kFpsActiveThreshold;
+
     expectAllLayersFlattened(layers);
 }