PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Hide remove user option for main user in multi user settings"

Browse Source
This commit is contained in:
Nikhil Kumar
2022-11-30 10:29:49 +00:00
committed by Android (Google) Code Review
parent a2ca625704 b61949c841
commit 511daeb1f9
2 changed files with 38 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/users/UserDetailsSettings.java
View File

@@ -317,8 +317,12 @@ public class UserDetailsSettings extends SettingsPreferenceFragment
mRemoveUserPref.setTitle(R.string.user_remove_user);
removePreference(KEY_APP_COPYING);
}
// Remove preference KEY_REMOVE_USER if DISALLOW_REMOVE_USER restriction is set
// on the current user or the user selected in user details settings is a main user.
if (RestrictedLockUtilsInternal.hasBaseUserRestriction(context,
UserManager.DISALLOW_REMOVE_USER, UserHandle.myUserId())) {
UserManager.DISALLOW_REMOVE_USER, UserHandle.myUserId())
|| mUserInfo.isMain()) {
removePreference(KEY_REMOVE_USER);
}
@@ -331,7 +335,7 @@ public class UserDetailsSettings extends SettingsPreferenceFragment
@VisibleForTesting
boolean canDeleteUser() {
if (!mUserManager.isAdminUser()) {
if (!mUserManager.isAdminUser() || mUserInfo.isMain()) {
return false;
}