commit d0694bce0306060574e976c4062fa67953b272f6
author Rachel Lee <rnlee@google.com> Tue Sep 12 14:57:58 2023 -0700
committer Rachel Lee <rnlee@google.com> Wed Sep 13 12:49:18 2023 -0700
tree c600967e259a25a81b3e24fb484611ebf27ff527
parent c0e40bc15e4517c8e377152b5c2416e39dfe7f80

Fix FrameRateCategory::NoPreference in SF

Decided the behavior should not be the same as LayerVoteType::NoVote.

Bug: 300152572
Test: atest libsurfaceflinger_unittest
Change-Id: I2e0a0d4959f1fdba3f5f7d04ca15ea9045d4cd36

services/surfaceflinger/Scheduler/RefreshRateSelector.cpp

diff --git a/services/surfaceflinger/Scheduler/RefreshRateSelector.cpp b/services/surfaceflinger/Scheduler/RefreshRateSelector.cpp
index 3ee6a4d..5a00972 100644
--- a/services/surfaceflinger/Scheduler/RefreshRateSelector.cpp
+++ b/services/surfaceflinger/Scheduler/RefreshRateSelector.cpp
@@ -599,7 +599,8 @@
               layer.name.c_str(), ftl::enum_string(layer.vote).c_str(), layer.weight,
               layer.desiredRefreshRate.getValue(),
               ftl::enum_string(layer.frameRateCategory).c_str());
-        if (layer.isNoVote() || layer.vote == LayerVoteType::Min) {
+        if (layer.isNoVote() || layer.frameRateCategory == FrameRateCategory::NoPreference ||
+            layer.vote == LayerVoteType::Min) {
             continue;
         }