Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6c245cb0 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "TimeStats: Remove TimeStats from SurfaceFlingerFactory"

parents 0c751e5e f0229a72

services/surfaceflinger/SurfaceFlinger.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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()),

services/surfaceflinger/SurfaceFlingerFactory.cpp

+0 −5
Original line number Diff line number Diff line
@@ -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;

services/surfaceflinger/SurfaceFlingerFactory.h

+0 −3
Original line number Diff line number Diff line
@@ -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;

};

services/surfaceflinger/tests/unittests/TestableSurfaceFlinger.h

+0 −6
Original line number Diff line number Diff line
@@ -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 */,