commit 3f84c50c32bd0b37c4ecf3a62dcf7134cf815234
author Ady Abraham <adyabr@google.com> Thu Nov 30 18:18:06 2023 -0800
committer Ady Abraham <adyabr@google.com> Fri Dec 01 02:22:47 2023 +0000
tree d81ae8a02b19244efe7665a7ea082ed05ec7bcc1
parent d7d9de5a1423784eb3281b1509b5666fdf4fae2e

SF: enable touch timer and content detection by default

Those features are required for frame rate override to work properly,
and frame rate override is enabled by default

Bug: 314217419
Test: manual
Change-Id: Iffdc24f0efad14d1dd35d650dcb0198ab9606652

services/surfaceflinger/Scheduler/Scheduler.cpp

diff --git a/services/surfaceflinger/Scheduler/Scheduler.cpp b/services/surfaceflinger/Scheduler/Scheduler.cpp
index 6eea7f1..738fd4e 100644
--- a/services/surfaceflinger/Scheduler/Scheduler.cpp
+++ b/services/surfaceflinger/Scheduler/Scheduler.cpp
@@ -92,7 +92,12 @@
     using namespace sysprop;
     using namespace std::string_literals;
 
-    if (const int64_t millis = set_touch_timer_ms(0); millis > 0) {
+    const int32_t defaultTouchTouchTimerValue =
+            FlagManager::getInstance().enable_fro_dependent_features() &&
+                    sysprop::enable_frame_rate_override(true)
+            ? 200
+            : 0;
+    if (const int32_t millis = set_touch_timer_ms(defaultTouchTouchTimerValue); millis > 0) {
         // Touch events are coming to SF every 100ms, so the timer needs to be higher than that
         mTouchTimer.emplace(
                 "TouchTimer", std::chrono::milliseconds(millis),