diff options
| -rw-r--r-- | cmds/dumpstate/dumpstate.cpp | 2 | ||||
| -rw-r--r-- | services/surfaceflinger/Scheduler/RefreshRateSelector.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/cmds/dumpstate/dumpstate.cpp b/cmds/dumpstate/dumpstate.cpp index c407f486f0..add9f9297b 100644 --- a/cmds/dumpstate/dumpstate.cpp +++ b/cmds/dumpstate/dumpstate.cpp @@ -4631,7 +4631,7 @@ void Dumpstate::UpdateProgress(int32_t delta_sec) { void Dumpstate::TakeScreenshot(const std::string& path) { const std::string& real_path = path.empty() ? screenshot_path_ : path; int status = - RunCommand("", {"/system/bin/screencap", "-p", real_path}, + RunCommand("", {"screencap", "-p", real_path}, CommandOptions::WithTimeout(10).Always().DropRoot().RedirectStderr().Build()); if (status == 0) { MYLOGD("Screenshot saved on %s\n", real_path.c_str()); diff --git a/services/surfaceflinger/Scheduler/RefreshRateSelector.cpp b/services/surfaceflinger/Scheduler/RefreshRateSelector.cpp index a4368a6db1..bbb3c52c9f 100644 --- a/services/surfaceflinger/Scheduler/RefreshRateSelector.cpp +++ b/services/surfaceflinger/Scheduler/RefreshRateSelector.cpp @@ -842,7 +842,7 @@ auto RefreshRateSelector::getRankedFrameRatesLocked(const std::vector<LayerRequi }); // 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 @@ auto RefreshRateSelector::getRankedFrameRatesLocked(const std::vector<LayerRequi 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}}; } } |