Merge "nfc: Add min_sdk for display flags" into main (05eb7f5a) · Commits · e / os / android_frameworks_base

AconfigFlags.bp

+12 −0

Original line number	Diff line number	Diff line
		@@ -1065,6 +1065,18 @@ java_aconfig_library {
		defaults: ["framework-minus-apex-aconfig-java-defaults"],
		}

		java_aconfig_library {
		name: "display_flags_lib-export",
		aconfig_declarations: "display_flags",
		defaults: ["framework-minus-apex-aconfig-java-defaults"],
		min_sdk_version: "30",
		mode: "exported",
		apex_available: [
		"//apex_available:platform",
		"com.android.nfcservices",
		],
		}

		cc_aconfig_library {
		name: "android.server.display.flags-aconfig-cc",
		aconfig_declarations: "display_flags",

+1 −0

Original line number	Diff line number	Diff line
		@@ -2,6 +2,7 @@ aconfig_declarations {
		name: "display_flags",
		package: "com.android.server.display.feature.flags",
		container: "system",
		exportable: true,
		srcs: [
		"*.aconfig",
		],

+1 −0

Original line number	Diff line number	Diff line
		@@ -319,6 +319,7 @@ flag {
		description: "Add a new category to get the built in displays."
		bug: "293651324"
		is_fixed_read_only: false
		is_exported: true
		}

		flag {