Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 62b4adbb authored by Brian Johnson's avatar Brian Johnson Committed by Android (Google) Code Review
Browse files

Merge "SF: Add a RO flag for a new hal api for reporting hdcp level" into main

parents df57c056 4f095462

services/surfaceflinger/FlagManager.cpp

+2 −0
Original line number Diff line number Diff line
@@ -103,6 +103,7 @@ void FlagManager::dump(std::string& result) const { 
    DUMP_FLAG(late_boot_misc2);

    DUMP_FLAG(vrr_config);

    DUMP_FLAG(hotplug2);

    DUMP_FLAG(hdcp_level_hal);



#undef DUMP_FLAG

}
@@ -167,6 +168,7 @@ FLAG_MANAGER_READ_ONLY_FLAG(enable_small_area_detection, "") 
FLAG_MANAGER_READ_ONLY_FLAG(misc1, "")

FLAG_MANAGER_READ_ONLY_FLAG(vrr_config, "debug.sf.enable_vrr_config")

FLAG_MANAGER_READ_ONLY_FLAG(hotplug2, "")

FLAG_MANAGER_READ_ONLY_FLAG(hdcp_level_hal, "")



/// Trunk stable server flags ///

FLAG_MANAGER_SERVER_FLAG(late_boot_misc2, "")

services/surfaceflinger/FlagManager.h

+1 −0
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ public: 
    bool misc1() const;

    bool vrr_config() const;

    bool hotplug2() const;

    bool hdcp_level_hal() const;



    /// Trunk stable server flags ///

    bool late_boot_misc2() const;

services/surfaceflinger/surfaceflinger_flags.aconfig

+9 −0
Original line number Diff line number Diff line
@@ -61,3 +61,12 @@ flag { 
  bug: "303460805"

  is_fixed_read_only: true

}



flag {

  name: "hdcp_level_hal"

  namespace: "core_graphics"

  description: "Feature flag for adding a HAL API to commuicate hdcp levels"

  bug: "285359126"

  is_fixed_read_only: true

}