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

Commit e87561ea authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Remove the extra parameters in onCommitNotComposited" into main am:... 

Merge "Remove the extra parameters in onCommitNotComposited" into main am: 13acbe3e am: 56cea287

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3359406



Change-Id: I47b353ea7a53038fc6b467a01ba5df0d6e451347
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents fff7f8e1 56cea287

services/surfaceflinger/Scheduler/ISchedulerCallback.h

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ struct ISchedulerCallback { 
    virtual void onChoreographerAttached() = 0;

    virtual void onExpectedPresentTimePosted(TimePoint, ftl::NonNull<DisplayModePtr>,

                                             Fps renderRate) = 0;

    virtual void onCommitNotComposited(PhysicalDisplayId pacesetterDisplayId) = 0;

    virtual void onCommitNotComposited() = 0;

    virtual void vrrDisplayIdle(bool idle) = 0;



protected:

services/surfaceflinger/Scheduler/Scheduler.cpp

+1 −1
Original line number Diff line number Diff line
@@ -242,7 +242,7 @@ void Scheduler::onFrameSignal(ICompositor& compositor, VsyncId vsyncId, 
            if (FlagManager::getInstance().vrr_config()) {

                compositor.sendNotifyExpectedPresentHint(pacesetterPtr->displayId);

            }

            mSchedulerCallback.onCommitNotComposited(pacesetterPtr->displayId);

            mSchedulerCallback.onCommitNotComposited();

            return;

        }

    }

services/surfaceflinger/SurfaceFlinger.cpp

+1 −1
Original line number Diff line number Diff line
@@ -4410,7 +4410,7 @@ void SurfaceFlinger::sendNotifyExpectedPresentHint(PhysicalDisplayId displayId) 
    scheduleNotifyExpectedPresentHint(displayId);

}



void SurfaceFlinger::onCommitNotComposited(PhysicalDisplayId pacesetterDisplayId) {

void SurfaceFlinger::onCommitNotComposited() {

    if (FlagManager::getInstance().commit_not_composited()) {

        mFrameTimeline->onCommitNotComposited();

    }

services/surfaceflinger/SurfaceFlinger.h

+1 −1
Original line number Diff line number Diff line
@@ -701,7 +701,7 @@ private: 
    void onChoreographerAttached() override;

    void onExpectedPresentTimePosted(TimePoint expectedPresentTime, ftl::NonNull<DisplayModePtr>,

                                     Fps renderRate) override;

    void onCommitNotComposited(PhysicalDisplayId pacesetterDisplayId) override

    void onCommitNotComposited() override

            REQUIRES(kMainThreadContext);

    void vrrDisplayIdle(bool idle) override;

services/surfaceflinger/tests/unittests/mock/MockSchedulerCallback.h

+2 −2
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ struct SchedulerCallback final : ISchedulerCallback { 
    MOCK_METHOD(void, onChoreographerAttached, (), (override));

    MOCK_METHOD(void, onExpectedPresentTimePosted, (TimePoint, ftl::NonNull<DisplayModePtr>, Fps),

                (override));

    MOCK_METHOD(void, onCommitNotComposited, (PhysicalDisplayId), (override));

    MOCK_METHOD(void, onCommitNotComposited, (), (override));

    MOCK_METHOD(void, vrrDisplayIdle, (bool), (override));

};
@@ -39,7 +39,7 @@ struct NoOpSchedulerCallback final : ISchedulerCallback { 
    void kernelTimerChanged(bool) override {}

    void onChoreographerAttached() override {}

    void onExpectedPresentTimePosted(TimePoint, ftl::NonNull<DisplayModePtr>, Fps) override {}

    void onCommitNotComposited(PhysicalDisplayId) override {}

    void onCommitNotComposited() override {}

    void vrrDisplayIdle(bool) override {}

};