Move picture profile flag from surfaceflinger to libgui
Bug: 337330263
Test: build
Flag: com.android.graphics.libgui.flags.apply_picture_profiles
Change-Id: I2c1aeba638ed9afc1a7059718d8e20ce86c5db61
diff --git a/libs/gui/libgui_flags.aconfig b/libs/gui/libgui_flags.aconfig
index 1c7e0e4..22d32e9 100644
--- a/libs/gui/libgui_flags.aconfig
+++ b/libs/gui/libgui_flags.aconfig
@@ -2,6 +2,14 @@
container: "system"
flag {
+ name: "apply_picture_profiles"
+ namespace: "tv_os_media"
+ description: "This flag controls sending picture profiles from BBQ to Composer HAL"
+ bug: "337330263"
+ is_fixed_read_only: true
+} # apply_picture_profiles
+
+flag {
name: "bq_setframerate"
namespace: "core_graphics"
description: "This flag controls plumbing setFrameRate thru BufferQueue"
diff --git a/services/surfaceflinger/common/FlagManager.cpp b/services/surfaceflinger/common/FlagManager.cpp
index bfa3e6e..57ef4c7 100644
--- a/services/surfaceflinger/common/FlagManager.cpp
+++ b/services/surfaceflinger/common/FlagManager.cpp
@@ -117,7 +117,6 @@
/// Trunk stable readonly flags ///
DUMP_READ_ONLY_FLAG(adpf_fmq_sf);
- DUMP_READ_ONLY_FLAG(apply_picture_profiles_sf);
DUMP_READ_ONLY_FLAG(connected_display);
DUMP_READ_ONLY_FLAG(enable_small_area_detection);
DUMP_READ_ONLY_FLAG(frame_rate_category_mrr);
@@ -225,7 +224,6 @@
/// Trunk stable readonly flags ///
FLAG_MANAGER_READ_ONLY_FLAG(adpf_fmq_sf, "")
-FLAG_MANAGER_READ_ONLY_FLAG(apply_picture_profiles_sf, "")
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")
diff --git a/services/surfaceflinger/common/include/common/FlagManager.h b/services/surfaceflinger/common/include/common/FlagManager.h
index dea76db..7716762 100644
--- a/services/surfaceflinger/common/include/common/FlagManager.h
+++ b/services/surfaceflinger/common/include/common/FlagManager.h
@@ -55,7 +55,6 @@
/// Trunk stable readonly flags ///
bool adpf_fmq_sf() const;
- bool apply_picture_profiles_sf() const;
bool connected_display() const;
bool frame_rate_category_mrr() const;
bool enable_small_area_detection() const;
diff --git a/services/surfaceflinger/surfaceflinger_flags_new.aconfig b/services/surfaceflinger/surfaceflinger_flags_new.aconfig
index df8cc17..ce334e4 100644
--- a/services/surfaceflinger/surfaceflinger_flags_new.aconfig
+++ b/services/surfaceflinger/surfaceflinger_flags_new.aconfig
@@ -19,14 +19,6 @@
} # adpf_gpu_sf
flag {
- name: "apply_picture_profiles_sf"
- namespace: "tv_os_media"
- description: "SurfaceFlinger applies picture profile requests and sends them to Composer HAL"
- bug: "337330263"
- is_fixed_read_only: true
-} # apply_picture_profiles_sf
-
-flag {
name: "arr_setframerate_api"
namespace: "core_graphics"
description: "New SDK Surface#setFrameRate API and Surface.FrameRateParams for Android 16"