SF: Remove RefreshRateConfigs::getAllRefreshRates()
Remove this function since it's (almost) unused.
Test: adb shell service call SurfaceFlinger 1035 i32 5
Bug: 159590486
Change-Id: Iaec883eb2b29fd8064885dcb4e590c0e7b6021cf
diff --git a/services/surfaceflinger/Scheduler/RefreshRateConfigs.cpp b/services/surfaceflinger/Scheduler/RefreshRateConfigs.cpp
index cd03c18..5b78483 100644
--- a/services/surfaceflinger/Scheduler/RefreshRateConfigs.cpp
+++ b/services/surfaceflinger/Scheduler/RefreshRateConfigs.cpp
@@ -463,10 +463,6 @@
return bestRefreshRate;
}
-const AllRefreshRatesMapType& RefreshRateConfigs::getAllRefreshRates() const {
- return mRefreshRates;
-}
-
const RefreshRate& RefreshRateConfigs::getMinRefreshRateByPolicy() const {
std::lock_guard lock(mLock);
return getMinRefreshRateByPolicyLocked();
diff --git a/services/surfaceflinger/Scheduler/RefreshRateConfigs.h b/services/surfaceflinger/Scheduler/RefreshRateConfigs.h
index 837a35d..6c83f8b 100644
--- a/services/surfaceflinger/Scheduler/RefreshRateConfigs.h
+++ b/services/surfaceflinger/Scheduler/RefreshRateConfigs.h
@@ -263,9 +263,6 @@
GlobalSignals* outSignalsConsidered = nullptr) const
EXCLUDES(mLock);
- // Returns all the refresh rates supported by the device. This won't change at runtime.
- const AllRefreshRatesMapType& getAllRefreshRates() const EXCLUDES(mLock);
-
// Returns the lowest refresh rate supported by the device. This won't change at runtime.
const RefreshRate& getMinRefreshRate() const { return *mMinSupportedRefreshRate; }
diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 68d2a68..5d08328 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -5309,12 +5309,17 @@
return NO_ERROR;
}
case 1035: {
- n = data.readInt32();
+ const int newConfigId = data.readInt32();
mDebugDisplayConfigSetByBackdoor = false;
- const auto numConfigs = mRefreshRateConfigs->getAllRefreshRates().size();
- if (n >= 0 && n < numConfigs) {
+ const auto displayId = getInternalDisplayId();
+ if (!displayId) {
+ ALOGE("No internal display found.");
+ return NO_ERROR;
+ }
+ const auto numConfigs = getHwComposer().getConfigs(*displayId).size();
+ if (newConfigId >= 0 && newConfigId < numConfigs) {
const auto displayToken = getInternalDisplayToken();
- status_t result = setActiveConfig(displayToken, n);
+ status_t result = setActiveConfig(displayToken, newConfigId);
if (result != NO_ERROR) {
return result;
}