commit 1b2e78ea17d86fcfa5d903803fa9c49fbbaf1068
author Nikhil Kumar <nykkumar@google.com> Tue Sep 19 17:53:37 2023 +0100
committer Nikhil Kumar <nykkumar@google.com> Mon Sep 25 10:49:01 2023 +0100
tree d5b607db578eccfc6a50a00e137297933b449f25
parent 3d5051963366ee0ea51a28b8eabbbac1eb425fa9

Add a feature flag for moving global restrictions in user 0 XML

Bug: 301067944
Test: m
Change-Id: If9fc9832a4f909076dcf5efc7cd1dcbfced5a679

AconfigFlags.bp

diff --git a/AconfigFlags.bp b/AconfigFlags.bp
index 7913ad1..a271d06 100644
--- a/AconfigFlags.bp
+++ b/AconfigFlags.bp
@@ -35,6 +35,7 @@
     ":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 @@
 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 @@
     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"],
+}

core/java/android/content/pm/OWNERS

diff --git a/core/java/android/content/pm/OWNERS b/core/java/android/content/pm/OWNERS
index 0a7d079..53dd3bf 100644
--- a/core/java/android/content/pm/OWNERS
+++ b/core/java/android/content/pm/OWNERS
@@ -9,3 +9,4 @@
 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

core/java/android/content/pm/multiuser.aconfig

diff --git a/core/java/android/content/pm/multiuser.aconfig b/core/java/android/content/pm/multiuser.aconfig
new file mode 100644
index 0000000..07ff7be
--- /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"
+}