Merge "Add a feature flag for moving global restrictions in user 0 XML" into main (f1325adb) · Commits · e / os / android_frameworks_base

AconfigFlags.bp

+15 −1

Original line number	Diff line number	Diff line
		@@ -35,6 +35,7 @@ aconfig_srcjars = [
		":android.permission.flags-aconfig-java{.generated_srcjars}",
		":hwui_flags_java_lib{.generated_srcjars}",
		":display_flags_lib{.generated_srcjars}",
		":android.multiuser.flags-aconfig-java{.generated_srcjars}",
		]

		filegroup {
		@@ -252,7 +253,7 @@ java_aconfig_library {
		aconfig_declarations {
		name: "android.content.pm.flags-aconfig",
		package: "android.content.pm",
		srcs: ["core/java/android/content/pm/*.aconfig"],
		srcs: ["core/java/android/content/pm/flags.aconfig"],
		}

		java_aconfig_library {
		@@ -313,3 +314,16 @@ java_aconfig_library {
		aconfig_declarations: "display_flags",
		defaults: ["framework-minus-apex-aconfig-java-defaults"],
		}

		// Multi user
		aconfig_declarations {
		name: "android.multiuser.flags-aconfig",
		package: "android.multiuser",
		srcs: ["core/java/android/content/pm/multiuser.aconfig"],
		}

		java_aconfig_library {
		name: "android.multiuser.flags-aconfig-java",
		aconfig_declarations: "android.multiuser.flags-aconfig",
		defaults: ["framework-minus-apex-aconfig-java-defaults"],
		}

+1 −0

Original line number	Diff line number	Diff line
		@@ -9,3 +9,4 @@ per-file Shortcut = file:/core/java/android/content/pm/SHORTCUT_OWNERS
		per-file Launcher = file:/core/java/android/content/pm/LAUNCHER_OWNERS
		per-file UserInfo* = file:/MULTIUSER_OWNERS
		per-file UserProperties = file:/MULTIUSER_OWNERS
		per-file multiuser = file:/MULTIUSER_OWNERS

0 → 100644

+8 −0

Original line number	Diff line number	Diff line
		package: "android.multiuser"

		flag {
		name: "save_global_and_guest_restrictions_on_system_user_xml"
		namespace: "multiuser"
		description: "Save guest and device policy global restrictions on the SYSTEM user's XML file."
		bug: "301067944"
		}