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

Commit 92a0abec authored by Ben Widawsky's avatar Ben Widawsky
Browse files

SF: Move FrameTimeline into Scheduler 

As part of decoupling the FrameTimeline and TokenManager it became
apparent that having FrameTimeline in its own directory didn't make a
lot of sense. Following this, the frametimeline namespace can also be
removed.

Bug: 414584347
Test: none
Flag: EXEMPT, refactor
Change-Id: I6a8d25c3433e78681ed0e1b6025b5441462435e3
parent 4b238a40

services/surfaceflinger/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -207,7 +207,6 @@ filegroup { 
        "DisplayDevice.cpp",

        "Effects/Daltonizer.cpp",

        "FpsReporter.cpp",

        "FrameTimeline/FrameTimeline.cpp",

        "FrameTracer/FrameTracer.cpp",

        "FrameTracker.cpp",

        "FrontEnd/LayerCreationArgs.cpp",
@@ -230,6 +229,7 @@ filegroup { 
        "RegionSamplingThread.cpp",

        "Scheduler/EventThread.cpp",

        "Scheduler/FrameRateOverrideMappings.cpp",

        "Scheduler/FrameTimeline.cpp",

        "Scheduler/LayerHistory.cpp",

        "Scheduler/LayerInfo.cpp",

        "Scheduler/MessageQueue.cpp",

services/surfaceflinger/FpsReporter.h

+1 −1
Original line number Diff line number Diff line
@@ -23,8 +23,8 @@ 
#include <unordered_map>



#include "Clock.h"

#include "FrameTimeline/FrameTimeline.h"

#include "FrontEnd/LayerHierarchy.h"

#include "Scheduler/FrameTimeline.h"

#include "WpHash.h"



namespace android {

services/surfaceflinger/Layer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -64,12 +64,12 @@ 


#include "DisplayDevice.h"

#include "DisplayHardware/HWComposer.h"

#include "FrameTimeline/FrameTimeline.h"

#include "FrameTracer/FrameTracer.h"

#include "FrontEnd/LayerCreationArgs.h"

#include "FrontEnd/LayerHandle.h"

#include "Layer.h"

#include "LayerProtoHelper.h"

#include "Scheduler/FrameTimeline.h"

#include "SurfaceFlinger.h"

#include "TimeStats/TimeStats.h"

#include "TransactionCallbackInvoker.h"

services/surfaceflinger/Scheduler/EventThread.cpp

+2 −2
Original line number Diff line number Diff line
@@ -42,11 +42,11 @@ 


#include <utils/Errors.h>



#include <Scheduler/Scheduler.h>

#include <common/FlagManager.h>

#include <scheduler/FrameRateMode.h>

#include <scheduler/VsyncConfig.h>

#include "FrameTimeline/FrameTimeline.h"

#include "FrameTimeline.h"

#include "Scheduler.h"

#include "VSyncDispatch.h"



#include "EventThread.h"

services/surfaceflinger/FrameTimeline/FrameTimeline.cpp→services/surfaceflinger/Scheduler/FrameTimeline.cpp

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 
#include <numeric>

#include <unordered_set>



#include "../Jank/JankTracker.h"

#include "Jank/JankTracker.h"



namespace android::frametimeline {