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

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

Merge "Error fix from enabling Clang thread-safety checks in aosp_panther"... 

Merge "Error fix from enabling Clang thread-safety checks in aosp_panther" into main am: 24abe441 am: 42657b72

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



Change-Id: I3e5756cc695cb496f2b715b1eeed17fd7f23bf6e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e227cadd 42657b72

services/surfaceflinger/tests/unittests/RefreshRateSelectorTest.cpp

+6 −2
Original line number Diff line number Diff line
@@ -100,7 +100,9 @@ struct TestableRefreshRateSelector : RefreshRateSelector { 
    const std::vector<Fps>& knownFrameRates() const { return mKnownFrameRates; }



    using RefreshRateSelector::GetRankedFrameRatesCache;

    auto& mutableGetRankedRefreshRatesCache() { return mGetRankedFrameRatesCache; }

    auto& mutableGetRankedRefreshRatesCache() NO_THREAD_SAFETY_ANALYSIS {

        return mGetRankedFrameRatesCache;

    }



    auto getRankedFrameRates(const std::vector<LayerRequirement>& layers,

                             GlobalSignals signals = {}, Fps pacesetterFps = {}) const {
@@ -138,7 +140,9 @@ struct TestableRefreshRateSelector : RefreshRateSelector { 
        return setPolicy(policy);

    }



    const auto& getPrimaryFrameRates() const { return mPrimaryFrameRates; }

    const auto& getPrimaryFrameRates() const NO_THREAD_SAFETY_ANALYSIS {

        return mPrimaryFrameRates;

    }

};



class RefreshRateSelectorTest : public testing::TestWithParam<Config::FrameRateOverride> {