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

Commit 3e7a40d9 authored by Rachel Lee's avatar Rachel Lee Committed by Automerger Merge Worker
Browse files

Merge "Revert "Resync on the transaction."" into udc-dev am: b82218d2 

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



Change-Id: Ibb696cdde60b96dd81fe97efffc51f507fe9a413
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9b33a045 b82218d2

services/surfaceflinger/Scheduler/Scheduler.cpp

+0 −1
Original line number Diff line number Diff line
@@ -402,7 +402,6 @@ void Scheduler::disableHardwareVsync(PhysicalDisplayId id, bool disallow) { 
}



void Scheduler::resyncAllToHardwareVsync(bool allowToEnable) {

    ATRACE_CALL();

    std::scoped_lock lock(mDisplayLock);

    ftl::FakeGuard guard(kMainThreadContext);

services/surfaceflinger/SurfaceFlinger.cpp

+0 −1
Original line number Diff line number Diff line
@@ -4147,7 +4147,6 @@ void SurfaceFlinger::setTransactionFlags(uint32_t mask, TransactionSchedule sche 
    ATRACE_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