diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2019-09-10 03:17:20 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-09-10 03:17:20 +0000 |
commit | 84aac0c9e2ee56b64f4ea04f8e97646b4a155273 (patch) | |
tree | 40407a7071a23f2da520ceff92ecbb421d766896 | |
parent | 126a25ea59e622bb614cb12b8200bed50f731f95 (diff) | |
parent | b419fa8686633b112b3fa153e29528cb8821ee6c (diff) | |
download | native-84aac0c9e2ee56b64f4ea04f8e97646b4a155273.tar.gz |
Snap for 5863759 from b419fa8686633b112b3fa153e29528cb8821ee6c to qt-qpr1-release
Change-Id: I0ba772f16febcf82949cf6ee9ba8fcf386442cf8
-rw-r--r-- | services/surfaceflinger/Layer.cpp | 2 | ||||
-rw-r--r-- | services/surfaceflinger/Scheduler/Scheduler.cpp | 9 |
2 files changed, 8 insertions, 3 deletions
diff --git a/services/surfaceflinger/Layer.cpp b/services/surfaceflinger/Layer.cpp index d6e86eb0e5..fdf9da342f 100644 --- a/services/surfaceflinger/Layer.cpp +++ b/services/surfaceflinger/Layer.cpp @@ -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(); diff --git a/services/surfaceflinger/Scheduler/Scheduler.cpp b/services/surfaceflinger/Scheduler/Scheduler.cpp index a194106112..baa677ee2a 100644 --- a/services/surfaceflinger/Scheduler/Scheduler.cpp +++ b/services/surfaceflinger/Scheduler/Scheduler.cpp @@ -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)); |