Merge "SystemUI Implement DISALLOW_GRANT_ADMIN in user creation flow" into main (8a79f56a) · Commits · e / os / android_frameworks_base

packages/SettingsLib/src/com/android/settingslib/users/CreateUserDialogController.java

+5 −5

Original line number	Diff line number	Diff line
		@@ -181,14 +181,14 @@ public class CreateUserDialogController {
		* admin status.
		*/
		public Dialog createDialog(Activity activity,
		ActivityStarter activityStarter, boolean isMultipleAdminEnabled,
		ActivityStarter activityStarter, boolean canCreateAdminUser,
		NewUserData successCallback, Runnable cancelCallback) {
		mActivity = activity;
		mCustomDialogHelper = new CustomDialogHelper(activity);
		mSuccessCallback = successCallback;
		mCancelCallback = cancelCallback;
		mActivityStarter = activityStarter;
		addCustomViews(isMultipleAdminEnabled);
		addCustomViews(canCreateAdminUser);
		mUserCreationDialog = mCustomDialogHelper.getDialog();
		updateLayout();
		mUserCreationDialog.setOnDismissListener(view -> finish());
		@@ -197,19 +197,19 @@ public class CreateUserDialogController {
		return mUserCreationDialog;
		}

		private void addCustomViews(boolean isMultipleAdminEnabled) {
		private void addCustomViews(boolean canCreateAdminUser) {
		addGrantAdminView();
		addUserInfoEditView();
		mCustomDialogHelper.setPositiveButton(R.string.next, view -> {
		mCurrentState++;
		if (mCurrentState == GRANT_ADMIN_DIALOG && !isMultipleAdminEnabled) {
		if (mCurrentState == GRANT_ADMIN_DIALOG && !canCreateAdminUser) {
		mCurrentState++;
		}
		updateLayout();
		});
		mCustomDialogHelper.setNegativeButton(R.string.back, view -> {
		mCurrentState--;
		if (mCurrentState == GRANT_ADMIN_DIALOG && !isMultipleAdminEnabled) {
		if (mCurrentState == GRANT_ADMIN_DIALOG && !canCreateAdminUser) {
		mCurrentState--;
		}
		updateLayout();

+1 −1

Original line number	Diff line number	Diff line
		@@ -116,7 +116,7 @@ public class CreateUserActivity extends Activity {
		return mCreateUserDialogController.createDialog(
		this,
		this::startActivity,
		(mUserCreator.isMultipleAdminEnabled() && mUserCreator.isUserAdmin()
		(mUserCreator.canCreateAdminUser() && mUserCreator.isUserAdmin()
		&& !isKeyguardShowing),
		this::addUserNow,
		this::finish

+13 −2

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@ import android.app.Dialog
		import android.content.Context
		import android.content.pm.UserInfo
		import android.graphics.drawable.Drawable
		import android.multiuser.Flags
		import android.os.UserManager
		import com.android.internal.util.UserIcons
		import com.android.settingslib.users.UserCreatingDialog
		@@ -91,7 +92,17 @@ constructor(
		return userManager.isAdminUser
		}

		fun isMultipleAdminEnabled(): Boolean {
		return UserManager.isMultipleAdminEnabled()
		/**
		* Checks if the creation of a new admin user is allowed.
		*
		* @return `true` if creating a new admin is allowed, `false` otherwise.
		*/
		fun canCreateAdminUser(): Boolean {
		return if (Flags.unicornModeRefactoringForHsumReadOnly()) {
		UserManager.isMultipleAdminEnabled() &&
		!userManager.hasUserRestriction(UserManager.DISALLOW_GRANT_ADMIN)
		} else {
		UserManager.isMultipleAdminEnabled()
		}
		}
		}