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

Commit d528a9c3 authored by Liz Prucka's avatar Liz Prucka Committed by Automerger Merge Worker
Browse files

Merge "Error fix from enabling Clang thread-safety checks." into main am: b310760b am: 9001fdf8 

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



Change-Id: I04d086a19de2d66150daad7b23d53e87953ffbeb
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9aeb2cbf 9001fdf8

services/surfaceflinger/Scheduler/RefreshRateSelector.h

+4 −1
Original line number Diff line number Diff line
@@ -321,7 +321,10 @@ public: 
    RefreshRateSelector(const RefreshRateSelector&) = delete;

    RefreshRateSelector& operator=(const RefreshRateSelector&) = delete;



    const DisplayModes& displayModes() const { return mDisplayModes; }

    DisplayModes displayModes() const {

        std::lock_guard lock(mLock);

        return mDisplayModes;

    }



    // Returns whether switching modes (refresh rate or resolution) is possible.

    // TODO(b/158780872): Consider HAL support, and skip frame rate detection if the modes only