From 1b2e78ea17d86fcfa5d903803fa9c49fbbaf1068 Mon Sep 17 00:00:00 2001
From: Nikhil Kumar <nykkumar@google.com>
Date: Tue, 19 Sep 2023 17:53:37 +0100
Subject: [PATCH] Add a feature flag for moving global restrictions in user 0
XML
Bug: 301067944
Test: m
Change-Id: If9fc9832a4f909076dcf5efc7cd1dcbfced5a679
---
AconfigFlags.bp | 16 +++++++++++++++-
core/java/android/content/pm/OWNERS | 1 +
core/java/android/content/pm/multiuser.aconfig | 8 ++++++++
3 files changed, 24 insertions(+), 1 deletion(-)
create mode 100644 core/java/android/content/pm/multiuser.aconfig
diff --git a/AconfigFlags.bp b/AconfigFlags.bp
index 7913ad1d09a5..a271d063d1f9 100644
--- a/AconfigFlags.bp
+++ b/AconfigFlags.bp
@@ -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"],
+}
diff --git a/core/java/android/content/pm/OWNERS b/core/java/android/content/pm/OWNERS
index 0a7d079b8939..53dd3bffe06c 100644
--- a/core/java/android/content/pm/OWNERS
+++ b/core/java/android/content/pm/OWNERS
@@ -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
diff --git a/core/java/android/content/pm/multiuser.aconfig b/core/java/android/content/pm/multiuser.aconfig
new file mode 100644
index 000000000000..07ff7be00114
--- /dev/null
+++ b/core/java/android/content/pm/multiuser.aconfig
@@ -0,0 +1,8 @@
+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"
+}
--
GitLab