Merge changes from topic "revert-3283578-revert-3272135-revert-3267014-revert-3208491-ndk_trace-EUQVSBHTRX-ELHECXUOUD-OVFLURPEJG-ITAIYMHVSD" into main am: ad04dd9019
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3283717
Change-Id: I2cab2098b0068b9ca05965d3684e8c2d0eb1581a
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}};
}
}