Merge "Add flag for applying picture profiles in SurfaceFlinger" into main

Author: Brian3031

libs/gui/Android.bp

@@ -341,6 +341,10 @@ cc_library_shared {
         "libgui_aidl_headers",
     ],
 
+    static_libs: [
+        "libsurfaceflingerflags",
+    ],
+
     afdo: true,
 
     lto: {

services/surfaceflinger/common/FlagManager.cpp

@@ -117,6 +117,7 @@ void FlagManager::dump(std::string& result) const {
 
     /// 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);
@@ -224,6 +225,7 @@ FLAG_MANAGER_LEGACY_SERVER_FLAG(use_skia_tracing, PROPERTY_SKIA_ATRACE_ENABLED,
 
 /// 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")

services/surfaceflinger/common/include/common/FlagManager.h

@@ -55,6 +55,7 @@ class FlagManager {
 
     /// 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;

services/surfaceflinger/surfaceflinger_flags_new.aconfig

@@ -18,6 +18,14 @@ flag {
   bug: "284324521"
 } # 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"