summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Nikhil Kumar <nykkumar@google.com> 2023-10-10 14:12:23 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2023-10-10 14:12:23 +0000
commit2d0cab306f2d29ec055d85c4c453c3e94de1a835 (patch)
treef02946c5858f428f4543240b621b72cf6233c548
parenta7a3e04f8c10f84844882cb596a3c876f803940a (diff)
parentc6cf15db547f189221579ce053b3c90fadc1d08c (diff)
Merge "Add a read-only flag for moving global restrictions in user 0 XML" into main
-rw-r--r--core/java/android/content/pm/multiuser.aconfig8
1 files changed, 8 insertions, 0 deletions
diff --git a/core/java/android/content/pm/multiuser.aconfig b/core/java/android/content/pm/multiuser.aconfig
index 3e12a1a66791..3ec239c7125e 100644
--- a/core/java/android/content/pm/multiuser.aconfig
+++ b/core/java/android/content/pm/multiuser.aconfig
@@ -8,6 +8,14 @@ flag {
}
flag {
+ name: "save_global_and_guest_restrictions_on_system_user_xml_read_only"
+ namespace: "multiuser"
+ description: "Save guest and device policy global restrictions on the SYSTEM user's XML file. (Read only flag)"
+ bug: "301067944"
+ is_fixed_read_only: true
+}
+
+flag {
name: "bind_wallpaper_service_on_its_own_thread_during_a_user_switch"
namespace: "multiuser"
description: "Bind wallpaper service on its own thread instead of system_server's main handler during a user switch."