TimeStats: Remove TimeStats from SurfaceFlingerFactory
Bug: 140266250
Test: atest libsurfaceflinger_unittest:TimeStatsTest
Change-Id: Id99bef0f0571dffc74b0b630694ecfb057e97d38
Merged-In: Id99bef0f0571dffc74b0b630694ecfb057e97d38
diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 4361a94..ddc8496 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -258,7 +258,7 @@
SurfaceFlinger::SurfaceFlinger(Factory& factory, SkipInitializationTag)
: mFactory(factory),
mInterceptor(mFactory.createSurfaceInterceptor(this)),
- mTimeStats(mFactory.createTimeStats()),
+ mTimeStats(std::make_shared<impl::TimeStats>()),
mFrameTracer(std::make_unique<FrameTracer>()),
mEventQueue(mFactory.createMessageQueue()),
mCompositionEngine(mFactory.createCompositionEngine()),
diff --git a/services/surfaceflinger/SurfaceFlingerFactory.cpp b/services/surfaceflinger/SurfaceFlingerFactory.cpp
index 041ff8d..4ddc132 100644
--- a/services/surfaceflinger/SurfaceFlingerFactory.cpp
+++ b/services/surfaceflinger/SurfaceFlingerFactory.cpp
@@ -35,7 +35,6 @@
#include "Scheduler/MessageQueue.h"
#include "Scheduler/PhaseOffsets.h"
#include "Scheduler/Scheduler.h"
-#include "TimeStats/TimeStats.h"
namespace android::surfaceflinger {
@@ -123,10 +122,6 @@
sp<ColorLayer> createColorLayer(const LayerCreationArgs& args) override {
return new ColorLayer(args);
}
-
- std::shared_ptr<TimeStats> createTimeStats() override {
- return std::make_shared<android::impl::TimeStats>();
- }
};
static Factory factory;
diff --git a/services/surfaceflinger/SurfaceFlingerFactory.h b/services/surfaceflinger/SurfaceFlingerFactory.h
index 5d487e6..4f303a3 100644
--- a/services/surfaceflinger/SurfaceFlingerFactory.h
+++ b/services/surfaceflinger/SurfaceFlingerFactory.h
@@ -44,7 +44,6 @@
class StartPropertySetThread;
class SurfaceFlinger;
class SurfaceInterceptor;
-class TimeStats;
struct DisplayDeviceCreationArgs;
struct LayerCreationArgs;
@@ -94,8 +93,6 @@
virtual sp<ColorLayer> createColorLayer(const LayerCreationArgs& args) = 0;
virtual sp<ContainerLayer> createContainerLayer(const LayerCreationArgs& args) = 0;
- virtual std::shared_ptr<TimeStats> createTimeStats() = 0;
-
protected:
~Factory() = default;
};
diff --git a/services/surfaceflinger/tests/unittests/TestableSurfaceFlinger.h b/services/surfaceflinger/tests/unittests/TestableSurfaceFlinger.h
index 9536dd1..968f317 100644
--- a/services/surfaceflinger/tests/unittests/TestableSurfaceFlinger.h
+++ b/services/surfaceflinger/tests/unittests/TestableSurfaceFlinger.h
@@ -37,7 +37,6 @@
#include "SurfaceFlingerFactory.h"
#include "SurfaceInterceptor.h"
#include "TestableScheduler.h"
-#include "TimeStats/TimeStats.h"
namespace android {
@@ -151,11 +150,6 @@
return nullptr;
}
- std::shared_ptr<TimeStats> createTimeStats() override {
- // TODO: Use test-fixture controlled factory
- return std::make_shared<android::impl::TimeStats>();
- }
-
using CreateBufferQueueFunction =
std::function<void(sp<IGraphicBufferProducer>* /* outProducer */,
sp<IGraphicBufferConsumer>* /* outConsumer */,