Merge "Export SettingsLib flags for PermissionController" into main (8fd8ec8d) · Commits · e / os / android_frameworks_base

AconfigFlags.bp

+13 −0

Original line number	Diff line number	Diff line
		@@ -1809,11 +1809,24 @@ aconfig_declarations {
		name: "aconfig_settingslib_flags",
		package: "com.android.settingslib.flags",
		container: "system",
		exportable: true,
		srcs: [
		"packages/SettingsLib/aconfig/settingslib.aconfig",
		],
		}

		java_aconfig_library {
		name: "aconfig_settingslib_exported_flags_java_lib",
		aconfig_declarations: "aconfig_settingslib_flags",
		defaults: ["framework-minus-apex-aconfig-java-defaults"],
		mode: "exported",
		min_sdk_version: "30",
		apex_available: [
		"//apex_available:platform",
		"com.android.permission",
		],
		}

		java_aconfig_library {
		name: "aconfig_settingslib_flags_java_lib",
		aconfig_declarations: "aconfig_settingslib_flags",

+2 −0

Original line number	Diff line number	Diff line
		@@ -97,6 +97,7 @@ flag {
		name: "settings_catalyst"
		namespace: "android_settings"
		description: "Settings catalyst project migration"
		is_exported: true
		bug: "323791114"
		is_exported: true
		}
		@@ -106,6 +107,7 @@ flag {
		is_fixed_read_only: true
		namespace: "android_settings"
		description: "Enable WRITE_SYSTEM_PREFERENCE permission and appop"
		is_exported: true
		bug: "375193223"
		is_exported: true
		}