Merge "SurfaceFlinger: Import hardware flags from aconfig" into main (f909829f) · Commits · e / os / android_frameworks_native

services/surfaceflinger/common/Android.bp

+4 −0

Original line number	Diff line number	Diff line
		@@ -38,6 +38,7 @@ cc_library_static {
		],
		static_libs: [
		"libsurfaceflingerflags",
		"aconfig_hardware_flags_c_lib",
		"android.os.flags-aconfig-cc",
		"android.server.display.flags-aconfig-cc",
		"libguiflags_no_apex",
		@@ -51,6 +52,7 @@ cc_library_static {
		],
		static_libs: [
		"libsurfaceflingerflags_test",
		"aconfig_hardware_flags_c_lib",
		"android.os.flags-aconfig-cc-test",
		"android.server.display.flags-aconfig-cc",
		"libguiflags_no_apex",
		@@ -67,6 +69,7 @@ cc_defaults {
		static_libs: [
		"libsurfaceflinger_common",
		"libsurfaceflingerflags",
		"aconfig_hardware_flags_c_lib",
		"android.os.flags-aconfig-cc",
		"android.server.display.flags-aconfig-cc",
		"libguiflags_no_apex",
		@@ -83,6 +86,7 @@ cc_defaults {
		static_libs: [
		"libsurfaceflinger_common_test",
		"libsurfaceflingerflags_test",
		"aconfig_hardware_flags_c_lib",
		"android.os.flags-aconfig-cc-test",
		"android.server.display.flags-aconfig-cc",
		"libguiflags_no_apex",

+3 −1

Original line number	Diff line number	Diff line
		@@ -27,6 +27,7 @@
		#include <cinttypes>

		#include <android_os.h>
		#include <android_hardware_flags.h>
		#include <com_android_graphics_libgui_flags.h>
		#include <com_android_graphics_surfaceflinger_flags.h>
		#include <com_android_server_display_feature_flags.h>
		@@ -279,5 +280,6 @@ FLAG_MANAGER_ACONFIG_FLAG_IMPORTED(idle_screen_refresh_rate_timeout, "",
		FLAG_MANAGER_ACONFIG_FLAG_IMPORTED(adpf_use_fmq_channel_fixed, "", android::os)
		FLAG_MANAGER_ACONFIG_FLAG_IMPORTED(trace_frame_rate_override, "",
		com::android::graphics::libgui::flags);

		FLAG_MANAGER_ACONFIG_FLAG_IMPORTED(luts_api, "",
		android::hardware::flags);
		} // namespace android

+1 −0

Original line number	Diff line number	Diff line
		@@ -102,6 +102,7 @@ public:
		bool deprecate_frame_tracker() const;
		bool skip_invisible_windows_in_input() const;
		bool begone_bright_hlg() const;
		bool luts_api() const;

		protected:
		// overridden for unit tests