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

Commit 354ccde4 authored by Ady Abraham's avatar Ady Abraham
Browse files

SF: import idle_screen_refresh_rate_timeout from DM 

Bug: 310026579
Test: presubmit
Change-Id: I3e4f762b1af9ee96823e9500b33c6015ff75eeb3
parent c56f5c2a

services/surfaceflinger/common/Android.bp

+4 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ cc_library_static { 
    static_libs: [

        "libsurfaceflingerflags",

        "android.os.flags-aconfig-cc",

        "android.server.display.flags-aconfig-cc",

    ],

}
@@ -47,6 +48,7 @@ cc_library_static { 
    static_libs: [

        "libsurfaceflingerflags_test",

        "android.os.flags-aconfig-cc-test",

        "android.server.display.flags-aconfig-cc",

    ],

}
@@ -59,6 +61,7 @@ cc_defaults { 
        "libsurfaceflinger_common",

        "libsurfaceflingerflags",

        "android.os.flags-aconfig-cc",

        "android.server.display.flags-aconfig-cc",

    ],

}
@@ -71,5 +74,6 @@ cc_defaults { 
        "libsurfaceflinger_common_test",

        "libsurfaceflingerflags_test",

        "android.os.flags-aconfig-cc-test",

        "android.server.display.flags-aconfig-cc",

    ],

}

services/surfaceflinger/common/FlagManager.cpp

+9 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 


#include <android_os.h>

#include <com_android_graphics_surfaceflinger_flags.h>

#include <com_android_server_display_feature_flags.h>



namespace android {

using namespace com::android::graphics::surfaceflinger;
@@ -137,6 +138,7 @@ void FlagManager::dump(std::string& result) const { 
    DUMP_READ_ONLY_FLAG(dont_skip_on_early_ro);

    DUMP_READ_ONLY_FLAG(protected_if_client);

    DUMP_READ_ONLY_FLAG(ce_fence_promise);

    DUMP_READ_ONLY_FLAG(idle_screen_refresh_rate_timeout);

#undef DUMP_READ_ONLY_FLAG

#undef DUMP_SERVER_FLAG

#undef DUMP_FLAG_INTERVAL
@@ -190,6 +192,9 @@ bool FlagManager::getServerConfigurableFlag(const char* experimentFlagName) cons 
#define FLAG_MANAGER_SERVER_FLAG_IMPORTED(name, syspropOverride, owner) \

    FLAG_MANAGER_FLAG_INTERNAL(name, syspropOverride, true, owner)



#define FLAG_MANAGER_READ_ONLY_FLAG_IMPORTED(name, syspropOverride, owner) \

    FLAG_MANAGER_FLAG_INTERNAL(name, syspropOverride, false, owner)



/// Legacy server flags ///

FLAG_MANAGER_LEGACY_SERVER_FLAG(test_flag, "", "")

FLAG_MANAGER_LEGACY_SERVER_FLAG(use_adpf_cpu_hint, "debug.sf.enable_adpf_cpu_hint",
@@ -230,4 +235,8 @@ FLAG_MANAGER_SERVER_FLAG(adpf_gpu_sf, "") 
/// Trunk stable server flags from outside SurfaceFlinger ///

FLAG_MANAGER_SERVER_FLAG_IMPORTED(adpf_use_fmq_channel, "", android::os)



/// Trunk stable readonly flags from outside SurfaceFlinger ///

FLAG_MANAGER_READ_ONLY_FLAG_IMPORTED(idle_screen_refresh_rate_timeout, "",

                                     com::android::server::display::feature::flags)



} // namespace android

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

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

    bool protected_if_client() const;

    bool ce_fence_promise() const;

    bool idle_screen_refresh_rate_timeout() const;



protected:

    // overridden for unit tests