commit a5dfed1507bf72e63551a7404ca7108befab4c44
author Jooyung Han <jooyung@google.com> Tue Nov 12 01:52:53 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Nov 12 01:52:53 2024 +0000
tree c9fc6d8debbc8603078e1d7a481304f02025cfd6
parent d8bfaae9799ecafe6f3f4f39d282de0666c987db
parent 59fc51c6dceae5b8cbae0a548e693df7aeda904f

Revert^2 "Use __builtin_available guard" am: 59fc51c6dc

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3342060

Change-Id: I3574c19d257f52094c70106ab64b3895e004ca0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

cmds/dumpstate/dumpstate.cpp

diff --git a/cmds/dumpstate/dumpstate.cpp b/cmds/dumpstate/dumpstate.cpp
index c407f48..add9f92 100644
--- a/cmds/dumpstate/dumpstate.cpp
+++ b/cmds/dumpstate/dumpstate.cpp
@@ -4631,7 +4631,7 @@
 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());

services/surfaceflinger/Scheduler/RefreshRateSelector.cpp

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}};
         }
     }