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

Commit b3042800 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "[AChoreographer] Resolves a deadlock" into rvc-dev am: a821321b am: 230381c3 

Change-Id: I520eb768d0244e4094f4991b9f6798f76037df3a
parents aaaf4cd3 230381c3

libs/nativedisplay/AChoreographer.cpp

+12 −3
Original line number Original line Diff line number Diff line
@@ -185,9 +185,18 @@ void Choreographer::unregisterRefreshRateCallback(AChoreographer_refreshRateCall 
}

}





void Choreographer::scheduleCallbacks() {

void Choreographer::scheduleCallbacks() {

    const nsecs_t now = systemTime(SYSTEM_TIME_MONOTONIC);

    nsecs_t dueTime;

    {

        AutoMutex _{mLock};

        AutoMutex _{mLock};

    nsecs_t now = systemTime(SYSTEM_TIME_MONOTONIC);

        // If there are no pending callbacks then don't schedule a vsync

    if (mFrameCallbacks.top().dueTime <= now) {

        if (mFrameCallbacks.empty()) {

            return;

        }

        dueTime = mFrameCallbacks.top().dueTime;

    }



    if (dueTime <= now) {

        ALOGV("choreographer %p ~ scheduling vsync", this);

        ALOGV("choreographer %p ~ scheduling vsync", this);

        scheduleVsync();

        scheduleVsync();

        return;

        return;