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

Commit 1b12d998 authored by Adrian Salido's avatar Adrian Salido Committed by Automerger Merge Worker
Browse files

Merge "SF: fix deadlock while switching resolution" into tm-dev am: c36a1ccb 

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

Change-Id: Ia1bd98b91a3214014030498af936ce31836743e5
parents 50c653ca c36a1ccb

services/surfaceflinger/SurfaceFlinger.cpp

+1 −1
Original line number Diff line number Diff line
@@ -6063,7 +6063,6 @@ void SurfaceFlinger::kernelTimerChanged(bool expired) { 
    static bool updateOverlay =

            property_get_bool("debug.sf.kernel_idle_timer_update_overlay", true);

    if (!updateOverlay) return;

    if (Mutex::Autolock lock(mStateLock); !isRefreshRateOverlayEnabled()) return;



    // Update the overlay on the main thread to avoid race conditions with

    // mRefreshRateConfigs->getCurrentRefreshRate()
@@ -6073,6 +6072,7 @@ void SurfaceFlinger::kernelTimerChanged(bool expired) { 
            ALOGW("%s: default display is null", __func__);

            return;

        }

        if (!display->isRefreshRateOverlayEnabled()) return;



        const auto desiredActiveMode = display->getDesiredActiveMode();

        const std::optional<DisplayModeId> desiredModeId = desiredActiveMode