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

Commit 60184f40 authored by Rachel Lee's avatar Rachel Lee Committed by Android (Google) Code Review
Browse files

Merge "Add FlagManager instance to SF."

parents 04c093a6 a2ecd831

services/surfaceflinger/SurfaceFlinger.cpp

+7 −0
Original line number Diff line number Diff line
@@ -109,6 +109,7 @@ 
#include "DisplayRenderArea.h"

#include "EffectLayer.h"

#include "Effects/Daltonizer.h"

#include "FlagManager.h"

#include "FpsReporter.h"

#include "FrameTimeline/FrameTimeline.h"

#include "FrameTracer/FrameTracer.h"
@@ -672,6 +673,7 @@ void SurfaceFlinger::bootFinished() { 
    const nsecs_t duration = now - mBootTime;

    ALOGI("Boot is finished (%ld ms)", long(ns2ms(duration)) );



    mFlagManager = std::make_unique<android::FlagManager>();

    mFrameTracer->initialize();

    mFrameTimeline->onBootFinished();
@@ -5129,6 +5131,11 @@ void SurfaceFlinger::dumpAllLocked(const DumpArgs& args, std::string& result) co 
    const GraphicBufferAllocator& alloc(GraphicBufferAllocator::get());

    alloc.dump(result);



    /*

     * Dump flag/property manager state

     */

    mFlagManager->dump(result);



    result.append(mTimeStats->miniDump());

    result.append("\n");

}

services/surfaceflinger/SurfaceFlinger.h

+3 −0
Original line number Diff line number Diff line
@@ -89,6 +89,7 @@ namespace android { 


class Client;

class EventThread;

class FlagManager;

class FpsReporter;

class TunnelModeEnabledReporter;

class HdrLayerInfoReporter;
@@ -1519,6 +1520,8 @@ private: 
    wp<IBinder> mActiveDisplayToken GUARDED_BY(mStateLock);



    const sp<WindowInfosListenerInvoker> mWindowInfosListenerInvoker;



    std::unique_ptr<FlagManager> mFlagManager;

};



} // namespace android