Merge "Allow creating admin users when 'config_enableMultipleAdmins' property is enabled"

3 files changed, 13 insertions, 5 deletions

diff --git a/core/java/android/os/UserManager.java b/core/java/android/os/UserManager.java
index 99152347106f..92ee393247a2 100644
--- a/core/java/android/os/UserManager.java
+++ b/core/java/android/os/UserManager.java
@@ -2095,6 +2095,15 @@ public class UserManager {
     }
 
     /**
+     * Returns whether multiple admins are enabled on the device
+     * @hide
+     */
+    public static boolean isMultipleAdminEnabled() {
+        return Resources.getSystem()
+                .getBoolean(com.android.internal.R.bool.config_enableMultipleAdmins);
+    }
+
+    /**
      * Checks whether the device is running in a headless system user mode.
      *
      * <p>Headless system user mode means the {@link #isSystemUser() system user} runs system
diff --git a/packages/SystemUI/src/com/android/systemui/user/CreateUserActivity.java b/packages/SystemUI/src/com/android/systemui/user/CreateUserActivity.java
index cd21a45be0ce..c570ec8d2cd7 100644
--- a/packages/SystemUI/src/com/android/systemui/user/CreateUserActivity.java
+++ b/packages/SystemUI/src/com/android/systemui/user/CreateUserActivity.java
@@ -64,7 +64,7 @@ public class CreateUserActivity extends Activity {
     private Dialog mGrantAdminDialog;
     private Dialog mSetupUserDialog;
     private final OnBackInvokedCallback mBackCallback = this::onBackInvoked;
-    private Boolean mGrantAdminRights;
+    private boolean mGrantAdminRights;
     @Inject
     public CreateUserActivity(UserCreator userCreator,
             EditUserInfoController editUserInfoController, IActivityManager activityManager,
@@ -83,8 +83,7 @@ public class CreateUserActivity extends Activity {
         if (savedInstanceState != null) {
             mEditUserInfoController.onRestoreInstanceState(savedInstanceState);
         }
-
-        if (mUserCreator.isHeadlessSystemUserMode()) {
+        if (mUserCreator.isMultipleAdminEnabled()) {
             mGrantAdminDialog = buildGrantAdminDialog();
             mGrantAdminDialog.show();
         } else {
diff --git a/packages/SystemUI/src/com/android/systemui/user/UserCreator.kt b/packages/SystemUI/src/com/android/systemui/user/UserCreator.kt
index 277f670597d3..1811c4d9f930 100644
--- a/packages/SystemUI/src/com/android/systemui/user/UserCreator.kt
+++ b/packages/SystemUI/src/com/android/systemui/user/UserCreator.kt
@@ -87,7 +87,7 @@ constructor(
         userManager.setUserAdmin(userId)
     }
 
-    fun isHeadlessSystemUserMode(): Boolean {
-        return UserManager.isHeadlessSystemUserMode()
+    fun isMultipleAdminEnabled(): Boolean {
+        return UserManager.isMultipleAdminEnabled()
     }
 }