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

Commit c5b36802 authored by Ram Indani's avatar Ram Indani Committed by Automerger Merge Worker
Browse files

Merge "SF: Fix deadlock while stopping idle timer" into tm-qpr-dev am: a489cfae am: fbbae0ec 

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



Change-Id: Ia60a411d12cb982f323dfa761acb981aa5eff4e6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c82abe75 fbbae0ec

services/surfaceflinger/Scheduler/Scheduler.cpp

+7 −2
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include <android/hardware/configstore/1.0/ISurfaceFlingerConfigs.h>

#include <android/hardware/configstore/1.1/ISurfaceFlingerConfigs.h>

#include <configstore/Utils.h>

#include <ftl/fake_guard.h>

#include <gui/WindowInfo.h>

#include <system/window.h>

#include <ui/DisplayStatInfo.h>
@@ -94,9 +95,13 @@ void Scheduler::startTimers() { 
}



void Scheduler::setRefreshRateConfigs(std::shared_ptr<RefreshRateConfigs> configs) {

    {

    // The current RefreshRateConfigs instance may outlive this call, so unbind its idle timer.

        std::scoped_lock lock(mRefreshRateConfigsLock);

    {

        // mRefreshRateConfigsLock is not locked here to avoid the deadlock

        // as the callback can attempt to acquire the lock before stopIdleTimer can finish

        // the execution. It's safe to FakeGuard as main thread is the only thread that

        // writes to the mRefreshRateConfigs.

        ftl::FakeGuard guard(mRefreshRateConfigsLock);

        if (mRefreshRateConfigs) {

            mRefreshRateConfigs->stopIdleTimer();

            mRefreshRateConfigs->clearIdleTimerCallbacks();