SF: Clean up RefreshRateConfigs tests
Finish renaming `config` to `mode`, and reduce repetition in preparation
of RefreshRateConfigs::RefreshRate removal.
Bug: 185535769
Bug: 129481165
Test: libsurfaceflinger_unittest
Change-Id: I9a87cec76387edbdfaeb31c1f24cff341489e45a
diff --git a/services/surfaceflinger/Scheduler/RefreshRateConfigs.h b/services/surfaceflinger/Scheduler/RefreshRateConfigs.h
index 849d297..7ef95f9 100644
--- a/services/surfaceflinger/Scheduler/RefreshRateConfigs.h
+++ b/services/surfaceflinger/Scheduler/RefreshRateConfigs.h
@@ -310,6 +310,9 @@
.idleTimerTimeoutMs = 0,
.supportKernelIdleTimer = false});
+ RefreshRateConfigs(const RefreshRateConfigs&) = delete;
+ RefreshRateConfigs& operator=(const RefreshRateConfigs&) = delete;
+
// Returns whether switching modes (refresh rate or resolution) is possible.
// TODO(b/158780872): Consider HAL support, and skip frame rate detection if the modes only
// differ in resolution.
@@ -391,11 +394,8 @@
void dump(std::string& result) const EXCLUDES(mLock);
- RefreshRateConfigs(const RefreshRateConfigs&) = delete;
- void operator=(const RefreshRateConfigs&) = delete;
-
private:
- friend class RefreshRateConfigsTest;
+ friend struct TestableRefreshRateConfigs;
void constructAvailableRefreshRates() REQUIRES(mLock);