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

Commit f4c8f386 authored by Ana Krulec's avatar Ana Krulec Committed by Android (Google) Code Review
Browse files

Merge "SF: Move relevant scheduler files into one directory."

parents 869525b8 fefcb58f

services/surfaceflinger/Android.bp

+4 −4
Original line number Diff line number Diff line
@@ -105,11 +105,8 @@ filegroup { 
        "DisplayHardware/HWComposerBufferCache.cpp",

        "DisplayHardware/PowerAdvisor.cpp",

        "DisplayHardware/VirtualDisplaySurface.cpp",

        "DispSync.cpp",

        "Effects/Daltonizer.cpp",

        "EventControlThread.cpp",

        "EventLog/EventLog.cpp",

        "EventThread.cpp",

        "FrameTracker.cpp",

        "GpuService.cpp",

        "Layer.cpp",
@@ -118,7 +115,6 @@ filegroup { 
        "LayerRejecter.cpp",

        "LayerStats.cpp",

        "LayerVector.cpp",

        "MessageQueue.cpp",

        "MonitoredProducer.cpp",

        "RenderArea.cpp",

        "RenderEngine/Description.cpp",
@@ -131,6 +127,10 @@ filegroup { 
        "RenderEngine/RenderEngine.cpp",

        "RenderEngine/Surface.cpp",

        "RenderEngine/Texture.cpp",

        "Scheduler/DispSync.cpp",

        "Scheduler/EventControlThread.cpp",

        "Scheduler/EventThread.cpp",

        "Scheduler/MessageQueue.cpp",

        "StartPropertySetThread.cpp",

        "SurfaceFlinger.cpp",

        "SurfaceInterceptor.cpp",

services/surfaceflinger/BufferLayerConsumer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -21,10 +21,10 @@ 


#include "BufferLayerConsumer.h"



#include "DispSync.h"

#include "Layer.h"

#include "RenderEngine/Image.h"

#include "RenderEngine/RenderEngine.h"

#include "Scheduler/DispSync.h"



#include <inttypes.h>

services/surfaceflinger/MonitoredProducer.cpp

+3 −2
Original line number Diff line number Diff line
@@ -14,10 +14,11 @@ 
 * limitations under the License.

 */



#include "MessageQueue.h"

#include "MonitoredProducer.h"

#include "SurfaceFlinger.h"

#include "Layer.h"

#include "SurfaceFlinger.h"



#include "Scheduler/MessageQueue.h"



namespace android {

services/surfaceflinger/DispSync.cpp→services/surfaceflinger/Scheduler/DispSync.cpp

+1 −2
Original line number Diff line number Diff line
@@ -528,8 +528,7 @@ void DispSync::scalePeriod(uint32_t multiplier, uint32_t divisor) { 
    // point "attempting" to set the scale to 1 when it is already

    // 1.  Check that special case so that we don't do a useless

    // update of the model.

    if ((multiplier == 1) && (divisor == 1) && (mPeriod == mPeriodBase))

        return;

    if ((multiplier == 1) && (divisor == 1) && (mPeriod == mPeriodBase)) return;



    mPeriod = mPeriodBase * multiplier / divisor;

    mThread->updateModel(mPeriod, mPhase, mReferenceTime);