commit 0dd0518ff64c2d30a366d1df1bc07b38d9f14206
author Rachel Lee <rnlee@google.com> Tue Aug 13 16:31:45 2024 -0700
committer Rachel Lee <rnlee@google.com> Fri Aug 16 16:03:13 2024 -0700
tree dba7082a7dc59b3680bf6c29022e5313d99180da
parent ba38f872df9008b436b07b5b247da7356411a2a8

Fixed source vote + no preference category for MRR

This allows the explicit setFrameRate fixed source votes to pass through
in MRR devices when an explicit frame rate category (No Preference)
is sent.

This allows new View logic to set video frame rate when there
is only one View.

Bug: 352206100
Test: atest libsurfaceflinger_unittest
Flag: com.android.graphics.surfaceflinger.flags.view_set_requested_frame_rate_mrr

Change-Id: I1d19318815f323852eab95b9d7c4b4a6e78518ab

services/surfaceflinger/common/FlagManager.cpp

diff --git a/services/surfaceflinger/common/FlagManager.cpp b/services/surfaceflinger/common/FlagManager.cpp
index a56bb51..07c720f 100644
--- a/services/surfaceflinger/common/FlagManager.cpp
+++ b/services/surfaceflinger/common/FlagManager.cpp
@@ -119,6 +119,7 @@
     DUMP_READ_ONLY_FLAG(connected_display);
     DUMP_READ_ONLY_FLAG(enable_small_area_detection);
     DUMP_READ_ONLY_FLAG(frame_rate_category_mrr);
+    DUMP_READ_ONLY_FLAG(view_set_requested_frame_rate_mrr);
     DUMP_READ_ONLY_FLAG(misc1);
     DUMP_READ_ONLY_FLAG(vrr_config);
     DUMP_READ_ONLY_FLAG(hotplug2);
@@ -222,6 +223,8 @@
 FLAG_MANAGER_READ_ONLY_FLAG(connected_display, "")
 FLAG_MANAGER_READ_ONLY_FLAG(enable_small_area_detection, "")
 FLAG_MANAGER_READ_ONLY_FLAG(frame_rate_category_mrr, "debug.sf.frame_rate_category_mrr")
+FLAG_MANAGER_READ_ONLY_FLAG(view_set_requested_frame_rate_mrr,
+                            "debug.sf.view_set_requested_frame_rate_mrr")
 FLAG_MANAGER_READ_ONLY_FLAG(misc1, "")
 FLAG_MANAGER_READ_ONLY_FLAG(vrr_config, "debug.sf.enable_vrr_config")
 FLAG_MANAGER_READ_ONLY_FLAG(hotplug2, "")