Merge "Wrap more methods to get and set properties of ANativeWindow." into main am: a75d99da27
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3284920
Change-Id: Ic94ea63dd599ec4a3e1fad98ffdddd9415e5cd7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/services/surfaceflinger/Scheduler/RefreshRateSelector.cpp b/services/surfaceflinger/Scheduler/RefreshRateSelector.cpp
index a4368a6..bbb3c52 100644
--- a/services/surfaceflinger/Scheduler/RefreshRateSelector.cpp
+++ b/services/surfaceflinger/Scheduler/RefreshRateSelector.cpp
@@ -842,7 +842,7 @@
});
// TODO(b/364651864): Evaluate correctness of primaryRangeIsSingleRate.
- if (!isVrrDevice() && policy->primaryRangeIsSingleRate()) {
+ if (!mIsVrrDevice.load() && policy->primaryRangeIsSingleRate()) {
// If we never scored any layers, then choose the rate from the primary
// range instead of picking a random score from the app range.
if (noLayerScore) {
@@ -891,7 +891,7 @@
if (scores.front().frameRateMode.fps <= touchRefreshRates.front().frameRateMode.fps) {
ALOGV("Touch Boost [late]");
ATRACE_FORMAT_INSTANT("%s (Touch Boost [late])",
- to_string(touchRefreshRates.front().frameRateMode.fps).c_str());
+ to_string(touchRefreshRates.front().frameRateMode.fps).c_str());
return {touchRefreshRates, GlobalSignals{.touch = true}};
}
}