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

Merge "Prevent restricted users from being made admins" into main

Browse Source
This commit is contained in:
Treehugger Robot
2024-08-15 16:59:58 +00:00
committed by Android (Google) Code Review
parent c8c5ac7be1 53058c197c
commit ea813ef565
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -570,7 +570,9 @@ public class UserDetailsSettings extends SettingsPreferenceFragment
* <li>OR multiple admin support is NOT enabled.</li> * <li>OR multiple admin support is NOT enabled.</li>
* <li>OR the <b>current</b> user has DISALLOW_GRANT_ADMIN restriction applied</li> * <li>OR the <b>current</b> user has DISALLOW_GRANT_ADMIN restriction applied</li>
* *
* <li>OR the <b>target</b> user ('mUserInfo') is a main user OR a guest user.</li> * <li>OR the <b>target</b> user ('mUserInfo') is a main user</li>
* <li>OR the <b>target</b> user ('mUserInfo') is not of type
* {@link UserManager#USER_TYPE_FULL_SECONDARY}</li>
* <li>OR the <b>target</b> user ('mUserInfo') has DISALLOW_GRANT_ADMIN restriction.</li> * <li>OR the <b>target</b> user ('mUserInfo') has DISALLOW_GRANT_ADMIN restriction.</li>
* </ul> * </ul>
* *
@@ -582,7 +584,7 @@ public class UserDetailsSettings extends SettingsPreferenceFragment
|| mUserManager.hasUserRestriction(UserManager.DISALLOW_GRANT_ADMIN); || mUserManager.hasUserRestriction(UserManager.DISALLOW_GRANT_ADMIN);
boolean targetUserRestricted = mUserInfo.isMain() boolean targetUserRestricted = mUserInfo.isMain()
|| mUserInfo.isGuest() || !(UserManager.USER_TYPE_FULL_SECONDARY.equals(mUserInfo.userType))
|| mUserManager.hasUserRestrictionForUser(UserManager.DISALLOW_GRANT_ADMIN, || mUserManager.hasUserRestrictionForUser(UserManager.DISALLOW_GRANT_ADMIN,
mUserInfo.getUserHandle()); mUserInfo.getUserHandle());