SF: Add a flag for the connected-display feature
Bug: 299486625
Test: adb shell dumpsys SurfaceFlinger -- check for
"ConnectedDisplayFlagValue"
Change-Id: I4526091ca938ef378877edf63b499a3c8c8a39d9
diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index a7f2845..517dc96 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -494,7 +494,9 @@
mLegacyFrontEndEnabled = !mLayerLifecycleManagerEnabled ||
base::GetBoolProperty("persist.debug.sf.enable_legacy_frontend"s, false);
+ // Trunk-Stable flags
mMiscFlagValue = flags::misc1();
+ mConnectedDisplayFlagValue = flags::connected_display();
}
LatchUnsignaledConfig SurfaceFlinger::getLatchUnsignaledConfig() {
@@ -6342,6 +6344,8 @@
colorizer.reset(result);
StringAppendF(&result, "MiscFlagValue: %s\n", mMiscFlagValue ? "true" : "false");
+ StringAppendF(&result, "ConnectedDisplayFlagValue: %s\n",
+ mConnectedDisplayFlagValue ? "true" : "false");
getRenderEngine().dump(result);
diff --git a/services/surfaceflinger/SurfaceFlinger.h b/services/surfaceflinger/SurfaceFlinger.h
index f752584..59b1172 100644
--- a/services/surfaceflinger/SurfaceFlinger.h
+++ b/services/surfaceflinger/SurfaceFlinger.h
@@ -1451,7 +1451,9 @@
void sfdo_scheduleComposite();
void sfdo_scheduleCommit();
+ // Trunk-Stable flags
bool mMiscFlagValue;
+ bool mConnectedDisplayFlagValue;
};
class SurfaceComposerAIDL : public gui::BnSurfaceComposer {
diff --git a/services/surfaceflinger/surfaceflinger_flags.aconfig b/services/surfaceflinger/surfaceflinger_flags.aconfig
index 0a36888..f47ed45 100644
--- a/services/surfaceflinger/surfaceflinger_flags.aconfig
+++ b/services/surfaceflinger/surfaceflinger_flags.aconfig
@@ -6,4 +6,12 @@
description: "This flag controls minor miscellaneous SurfaceFlinger changes"
bug: "297389311"
is_fixed_read_only: true
-}
\ No newline at end of file
+}
+
+flag {
+ name: "connected_display"
+ namespace: "core_graphics"
+ description: "Controls SurfaceFlinger support for Connected Displays"
+ bug: "278199093"
+ is_fixed_read_only: true
+}