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

Commit 84aac0c9 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 5863759 from b419fa86 to qt-qpr1-release 

Change-Id: I0ba772f16febcf82949cf6ee9ba8fcf386442cf8
parents 126a25ea b419fa86

services/surfaceflinger/Layer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -2048,7 +2048,7 @@ InputWindowInfo Layer::fillInputInfo() { 
    InputWindowInfo info = mDrawingState.inputInfo;



    if (info.displayId == ADISPLAY_ID_NONE) {

        info.displayId = mDrawingState.layerStack;

        info.displayId = getLayerStack();

    }



    ui::Transform t = getTransform();

services/surfaceflinger/Scheduler/Scheduler.cpp

+7 −2
Original line number Diff line number Diff line
@@ -567,8 +567,13 @@ Scheduler::RefreshRateType Scheduler::calculateRefreshRateType() { 
    }



    // Content detection is on, find the appropriate refresh rate with minimal error

    auto iter = min_element(mRefreshRateConfigs.getRefreshRates().cbegin(),

                            mRefreshRateConfigs.getRefreshRates().cend(),

    auto begin = mRefreshRateConfigs.getRefreshRates().cbegin();



    // Skip POWER_SAVING config as it is not a real config

    if (begin->first == RefreshRateType::POWER_SAVING) {

        ++begin;

    }

    auto iter = min_element(begin, mRefreshRateConfigs.getRefreshRates().cend(),

                            [rate = mContentRefreshRate](const auto& l, const auto& r) -> bool {

                                return std::abs(l.second->fps - static_cast<float>(rate)) <

                                        std::abs(r.second->fps - static_cast<float>(rate));