commit 48eb4355d1bf4b602993651efba4ed2a640dec78
author Matt Buckley <mattbuckley@google.com> Fri Oct 18 11:48:46 2024 -0700
committer Matt Buckley <mattbuckley@google.com> Tue Oct 22 15:10:24 2024 -0700
tree 86a8b6b68930a8f12c6df49dbf1769f2a05639e7
parent c0bc4ae90f4e1e53bfbb3f0c90818b1c0a9927c8

Add additional flag for FMQ SF

This flag helps decouple the SF FMQ rollout from the rest of the FMQ
rollout

Bug: 284324521
Bug: 315894228
Flag: com.android.graphics.surfaceflinger.flags.adpf_fmq_sf
Flag: android.os.adpf_use_fmq_channel_fixed
Test: atest PowerAdvisorTest
Change-Id: I101fb3861fb7c03c5d070c065acf1069bf90ccc6

services/surfaceflinger/DisplayHardware/PowerAdvisor.cpp

diff --git a/services/surfaceflinger/DisplayHardware/PowerAdvisor.cpp b/services/surfaceflinger/DisplayHardware/PowerAdvisor.cpp
index 334c104..c914ec3 100644
--- a/services/surfaceflinger/DisplayHardware/PowerAdvisor.cpp
+++ b/services/surfaceflinger/DisplayHardware/PowerAdvisor.cpp
@@ -240,7 +240,8 @@
                                                                  &mSessionConfig);
             if (ret.isOk()) {
                 mHintSession = ret.value();
-                if (FlagManager::getInstance().adpf_use_fmq_channel_fixed()) {
+                if (FlagManager::getInstance().adpf_use_fmq_channel_fixed() &&
+                    FlagManager::getInstance().adpf_fmq_sf()) {
                     setUpFmq();
                 }
             }