Surfaceflinger: rename PhaseOffsets to VsyncConfiguration
Renaming for easier diff with upcoming CLs.
Test: boot
Bug: 162888874
Change-Id: I38b6b3675e3a6ca8ad2a8ac66d8566930779c08e
diff --git a/services/surfaceflinger/Android.bp b/services/surfaceflinger/Android.bp
index e452187..e341af1 100644
--- a/services/surfaceflinger/Android.bp
+++ b/services/surfaceflinger/Android.bp
@@ -169,7 +169,6 @@
"Scheduler/LayerInfo.cpp",
"Scheduler/LayerInfoV2.cpp",
"Scheduler/MessageQueue.cpp",
- "Scheduler/PhaseOffsets.cpp",
"Scheduler/RefreshRateConfigs.cpp",
"Scheduler/Scheduler.cpp",
"Scheduler/SchedulerUtils.cpp",
@@ -178,6 +177,7 @@
"Scheduler/VSyncPredictor.cpp",
"Scheduler/VsyncModulator.cpp",
"Scheduler/VSyncReactor.cpp",
+ "Scheduler/VsyncConfiguration.cpp",
"StartPropertySetThread.cpp",
"SurfaceFlinger.cpp",
"SurfaceFlingerDefaultFactory.cpp",
diff --git a/services/surfaceflinger/Scheduler/PhaseOffsets.cpp b/services/surfaceflinger/Scheduler/VsyncConfiguration.cpp
similarity index 99%
rename from services/surfaceflinger/Scheduler/PhaseOffsets.cpp
rename to services/surfaceflinger/Scheduler/VsyncConfiguration.cpp
index fe2e406..5373742 100644
--- a/services/surfaceflinger/Scheduler/PhaseOffsets.cpp
+++ b/services/surfaceflinger/Scheduler/VsyncConfiguration.cpp
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include "PhaseOffsets.h"
+#include "VsyncConfiguration.h"
#include <cutils/properties.h>
diff --git a/services/surfaceflinger/Scheduler/PhaseOffsets.h b/services/surfaceflinger/Scheduler/VsyncConfiguration.h
similarity index 100%
rename from services/surfaceflinger/Scheduler/PhaseOffsets.h
rename to services/surfaceflinger/Scheduler/VsyncConfiguration.h
diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index e9970cf..9a86625 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -122,8 +122,8 @@
#include "Scheduler/EventThread.h"
#include "Scheduler/LayerHistory.h"
#include "Scheduler/MessageQueue.h"
-#include "Scheduler/PhaseOffsets.h"
#include "Scheduler/Scheduler.h"
+#include "Scheduler/VsyncConfiguration.h"
#include "StartPropertySetThread.h"
#include "SurfaceFlingerProperties.h"
#include "SurfaceInterceptor.h"
diff --git a/services/surfaceflinger/SurfaceFlingerDefaultFactory.cpp b/services/surfaceflinger/SurfaceFlingerDefaultFactory.cpp
index 025d1a4..f80c804 100644
--- a/services/surfaceflinger/SurfaceFlingerDefaultFactory.cpp
+++ b/services/surfaceflinger/SurfaceFlingerDefaultFactory.cpp
@@ -39,8 +39,8 @@
#include "DisplayHardware/ComposerHal.h"
#include "Scheduler/DispSync.h"
#include "Scheduler/MessageQueue.h"
-#include "Scheduler/PhaseOffsets.h"
#include "Scheduler/Scheduler.h"
+#include "Scheduler/VsyncConfiguration.h"
namespace android::surfaceflinger {
diff --git a/services/surfaceflinger/tests/unittests/Android.bp b/services/surfaceflinger/tests/unittests/Android.bp
index 4a59c19..7cc9cef 100644
--- a/services/surfaceflinger/tests/unittests/Android.bp
+++ b/services/surfaceflinger/tests/unittests/Android.bp
@@ -46,7 +46,6 @@
"LayerHistoryTest.cpp",
"LayerHistoryTestV2.cpp",
"LayerMetadataTest.cpp",
- "PhaseOffsetsTest.cpp",
"PromiseTest.cpp",
"SchedulerTest.cpp",
"SchedulerUtilsTest.cpp",
@@ -64,6 +63,7 @@
"VsyncModulatorTest.cpp",
"VSyncPredictorTest.cpp",
"VSyncReactorTest.cpp",
+ "VsyncConfigurationTest.cpp",
"mock/DisplayHardware/MockComposer.cpp",
"mock/DisplayHardware/MockDisplay.cpp",
"mock/DisplayHardware/MockPowerAdvisor.cpp",
diff --git a/services/surfaceflinger/tests/unittests/FakePhaseOffsets.h b/services/surfaceflinger/tests/unittests/FakeVsyncConfiguration.h
similarity index 96%
rename from services/surfaceflinger/tests/unittests/FakePhaseOffsets.h
rename to services/surfaceflinger/tests/unittests/FakeVsyncConfiguration.h
index b50ddf5..d023b97 100644
--- a/services/surfaceflinger/tests/unittests/FakePhaseOffsets.h
+++ b/services/surfaceflinger/tests/unittests/FakeVsyncConfiguration.h
@@ -18,7 +18,7 @@
#include <gmock/gmock.h>
-#include "Scheduler/PhaseOffsets.h"
+#include "Scheduler/VsyncConfiguration.h"
namespace android::scheduler {
diff --git a/services/surfaceflinger/tests/unittests/TestableSurfaceFlinger.h b/services/surfaceflinger/tests/unittests/TestableSurfaceFlinger.h
index df15516..00fe5ff5 100644
--- a/services/surfaceflinger/tests/unittests/TestableSurfaceFlinger.h
+++ b/services/surfaceflinger/tests/unittests/TestableSurfaceFlinger.h
@@ -29,7 +29,7 @@
#include "ContainerLayer.h"
#include "DisplayDevice.h"
#include "EffectLayer.h"
-#include "FakePhaseOffsets.h"
+#include "FakeVsyncConfiguration.h"
#include "Layer.h"
#include "NativeWindowSurface.h"
#include "Scheduler/MessageQueue.h"
diff --git a/services/surfaceflinger/tests/unittests/PhaseOffsetsTest.cpp b/services/surfaceflinger/tests/unittests/VsyncConfigurationTest.cpp
similarity index 98%
rename from services/surfaceflinger/tests/unittests/PhaseOffsetsTest.cpp
rename to services/surfaceflinger/tests/unittests/VsyncConfigurationTest.cpp
index 96bb74b..0c51cfb 100644
--- a/services/surfaceflinger/tests/unittests/PhaseOffsetsTest.cpp
+++ b/services/surfaceflinger/tests/unittests/VsyncConfigurationTest.cpp
@@ -25,7 +25,7 @@
#include <log/log.h>
#include <thread>
-#include "Scheduler/PhaseOffsets.h"
+#include "Scheduler/VsyncConfiguration.h"
using namespace testing;