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

Commit 2a95359e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "SurfaceFlinger: getRefreshRateForContentV2 always returns valid config" into rvc-dev

parents 8181bb0f de7156e4
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -235,13 +235,13 @@ const RefreshRate& RefreshRateConfigs::getRefreshRateForContentV2(
            ? getBestRefreshRate(scores.rbegin(), scores.rend())
            : getBestRefreshRate(scores.begin(), scores.end());

    return bestRefreshRate == nullptr ? *mCurrentRefreshRate : *bestRefreshRate;
    return *bestRefreshRate;
}

template <typename Iter>
const RefreshRate* RefreshRateConfigs::getBestRefreshRate(Iter begin, Iter end) const {
    const RefreshRate* bestRefreshRate = nullptr;
    float max = 0;
    const RefreshRate* bestRefreshRate = begin->first;
    float max = begin->second;
    for (auto i = begin; i != end; ++i) {
        const auto [refreshRate, score] = *i;
        ALOGV("%s scores %.2f", refreshRate->name.c_str(), score);