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

Commit bdd20396 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Revert "Resync on the transaction."" into main

parents 07b0a37a 529a0a72

services/surfaceflinger/Scheduler/Scheduler.h

+1 −1
Original line number Diff line number Diff line
@@ -209,7 +209,6 @@ public: 
        ftl::FakeGuard guard(kMainThreadContext);

        resyncToHardwareVsyncLocked(id, allowToEnable, modePtr);

    }

    void resync() override EXCLUDES(mDisplayLock);

    void forceNextResync() { mLastResyncTime = 0; }



    // Passes a vsync sample to VsyncController. Returns true if
@@ -471,6 +470,7 @@ private: 
    bool throttleVsync(TimePoint, uid_t) override;

    // Get frame interval

    Period getVsyncPeriod(uid_t) override EXCLUDES(mDisplayLock);

    void resync() override EXCLUDES(mDisplayLock);

    void onExpectedPresentTimePosted(TimePoint expectedPresentTime) override EXCLUDES(mDisplayLock);



    std::unique_ptr<EventThread> mRenderEventThread;

services/surfaceflinger/SurfaceFlinger.cpp

+0 −1
Original line number Diff line number Diff line
@@ -4605,7 +4605,6 @@ void SurfaceFlinger::setTransactionFlags(uint32_t mask, TransactionSchedule sche 
    SFTRACE_INT("mTransactionFlags", transactionFlags);



    if (const bool scheduled = transactionFlags & mask; !scheduled) {

        mScheduler->resync();

        scheduleCommit(frameHint);

    } else if (frameHint == FrameHint::kActive) {

        // Even if the next frame is already scheduled, we should reset the idle timer