commit 95df6a1ceb72675c6cbf03a1a4e86aeda4a4b59c
author Dominik Laskowski <domlaskowski@google.com> Fri Oct 07 18:11:07 2022 -0400
committer Dominik Laskowski <domlaskowski@google.com> Tue Oct 11 13:23:59 2022 -0400
tree ac53ff5e30022b0d3c968cce21a6d4e1a9bdc9a4
parent a39238eec91605186771bc2181d242570b32dc11

SF: Remove DisplayModeSelectionParams

Extract makeGlobalSignals instead. Inline getRankedDisplayModes.

Bug: 241285191
Test: libsurfaceflinger_unittest
Change-Id: Ic48ac3ad1bd9df6820c9c9e5f6384b8d15b38809

services/surfaceflinger/Scheduler/Scheduler.h

diff --git a/services/surfaceflinger/Scheduler/Scheduler.h b/services/surfaceflinger/Scheduler/Scheduler.h
index d6f62ca..f104e45 100644
--- a/services/surfaceflinger/Scheduler/Scheduler.h
+++ b/services/surfaceflinger/Scheduler/Scheduler.h
@@ -116,12 +116,6 @@
     size_t numDisplays;
 };
 
-// Represents LayerRequirements and GlobalSignals to be considered for the display mode selection.
-struct DisplayModeSelectionParams {
-    std::vector<RefreshRateConfigs::LayerRequirement> layerRequirements;
-    GlobalSignals globalSignals;
-};
-
 // Represents the RefreshRateRankings and GlobalSignals for the selected RefreshRateRankings.
 struct RefreshRateRankingsAndSignals {
     std::vector<RefreshRateRanking> refreshRateRankings;
@@ -303,11 +297,6 @@
     template <typename S, typename T>
     GlobalSignals applyPolicy(S Policy::*, T&&) EXCLUDES(mPolicyLock);
 
-    // Returns the list of display modes in descending order of their priority that fulfills the
-    // policy, and the signals that were considered.
-    std::pair<std::vector<RefreshRateRanking>, GlobalSignals> getRankedDisplayModes()
-            REQUIRES(mPolicyLock);
-
     // Returns the best display mode per display.
     std::vector<DisplayModeConfig> getBestDisplayModeConfigs() const REQUIRES(mPolicyLock);
 
@@ -315,9 +304,7 @@
     std::vector<DisplayModeConfig> getDisplayModeConfigsForTheChosenFps(
             Fps chosenFps, const std::vector<RefreshRateRankingsAndSignals>&) const;
 
-    // Returns the DisplayModeSelectionParams to be considered for the
-    // DisplayMode selection based on the current Policy and GlobalSignals.
-    DisplayModeSelectionParams getDisplayModeSelectionParams() const REQUIRES(mPolicyLock);
+    GlobalSignals makeGlobalSignals() const REQUIRES(mPolicyLock);
 
     bool updateFrameRateOverrides(GlobalSignals, Fps displayRefreshRate) REQUIRES(mPolicyLock);