diff options
4 files changed, 1 insertions, 15 deletions
diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp index bb4a6287ac..1af67fb283 100644 --- a/services/surfaceflinger/SurfaceFlinger.cpp +++ b/services/surfaceflinger/SurfaceFlinger.cpp @@ -258,7 +258,7 @@ SurfaceFlingerBE::SurfaceFlingerBE() : mHwcServiceName(getHwcServiceName()) {} 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 041ff8d722..4ddc132a2e 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<SurfaceFlinger> createSurfaceFlinger() { 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 5d487e6da5..4f303a37be 100644 --- a/services/surfaceflinger/SurfaceFlingerFactory.h +++ b/services/surfaceflinger/SurfaceFlingerFactory.h @@ -44,7 +44,6 @@ class Scheduler; class StartPropertySetThread; class SurfaceFlinger; class SurfaceInterceptor; -class TimeStats; struct DisplayDeviceCreationArgs; struct LayerCreationArgs; @@ -94,8 +93,6 @@ public: 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 5e075b6a4b..d0d391b679 100644 --- a/services/surfaceflinger/tests/unittests/TestableSurfaceFlinger.h +++ b/services/surfaceflinger/tests/unittests/TestableSurfaceFlinger.h @@ -38,7 +38,6 @@ #include "SurfaceFlingerFactory.h" #include "SurfaceInterceptor.h" #include "TestableScheduler.h" -#include "TimeStats/TimeStats.h" namespace android { @@ -152,11 +151,6 @@ public: 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 */, |