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/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 85c16b7..6b6427f 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -4087,7 +4087,10 @@
 
     FeatureFlags features;
 
-    if (sysprop::use_content_detection_for_refresh_rate(false)) {
+    const auto defaultContentDetectionValue =
+            FlagManager::getInstance().enable_fro_dependent_features() &&
+            sysprop::enable_frame_rate_override(true);
+    if (sysprop::use_content_detection_for_refresh_rate(defaultContentDetectionValue)) {
         features |= Feature::kContentDetection;
         if (FlagManager::getInstance().enable_small_area_detection()) {
             features |= Feature::kSmallDirtyContentDetection;