summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Adam Bookatz <bookatz@google.com> 2023-02-27 14:33:28 -0800
committer Adam Bookatz <bookatz@google.com> 2023-02-27 14:33:28 -0800
commitf62d2aab119ced7364692fd0bedd99b5fb7de1e1 (patch)
tree4784d321a17dd03c91eb123836bd3bdf5f4f5aee
parent3521df06db71c084bb7c132b84e6ad45ca240f77 (diff)
MainUser permanent admin by default
On HSUM builds, we generally want the MainUser to be a permanent admin user in AOSP. OEMs are free to turn that off, but then they are responsible for handling initial user creation themselves. This doesn't have any effect on non-HSUM builds (unless they are using adb to emulate HSUM builds). Bug: 270961661 Test: atest UserManagerTest Change-Id: Iecf7129a9faeeede1bc1b8b7083dc98f37569556
-rw-r--r--core/res/res/values/config.xml6
1 files changed, 4 insertions, 2 deletions
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index 2f94ed77ed49..3e9fb4a769e1 100644
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -2780,8 +2780,10 @@
<integer name="config_userTypePackageWhitelistMode">13</integer> <!-- 1+4+8 -->
<!-- Whether the main user is a permanent admin user. If the main user is a permanent admin user
- it can't be deleted or downgraded to non-admin status. -->
- <bool name="config_isMainUserPermanentAdmin">false</bool>
+ it can't be deleted or downgraded to non-admin status.
+ This is generally only relevant on headless system user mode devices; on other devices, the
+ main user is the system user which is always a permanent admin anyway. -->
+ <bool name="config_isMainUserPermanentAdmin">true</bool>
<!-- Whether switch to headless system user is allowed. If allowed,
headless system user can run in the foreground even though it is not a full user. -->