Merge "Allow creating admin users when 'config_enableMultipleAdmins' property is enabled" (452bb886) · Commits · e / os / android_frameworks_base

core/java/android/os/UserManager.java

+9 −0

Original line number	Diff line number	Diff line
		@@ -2094,6 +2094,15 @@ public class UserManager {
		.getBoolean(com.android.internal.R.bool.config_guestUserAllowEphemeralStateChange);
		}

		/**
		* 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.
		*

+2 −3

Original line number	Diff line number	Diff line
		@@ -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 {

+2 −2

Original line number	Diff line number	Diff line
		@@ -87,7 +87,7 @@ constructor(
		userManager.setUserAdmin(userId)
		}

		fun isHeadlessSystemUserMode(): Boolean {
		return UserManager.isHeadlessSystemUserMode()
		fun isMultipleAdminEnabled(): Boolean {
		return UserManager.isMultipleAdminEnabled()
		}
		}