From 53058c197cd4c6ee5fc51b3b5769b5158696c0ce Mon Sep 17 00:00:00 2001 From: Tetiana Meronyk Date: Tue, 13 Aug 2024 17:39:56 +0000 Subject: [PATCH] Prevent restricted users from being made admins Bug: 357704332 Test: manual Flag: EXEMPT bug_fix Restricted Change-Id: I45b31616829134a61bfa587302c5165da192dc8a --- src/com/android/settings/users/UserDetailsSettings.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/com/android/settings/users/UserDetailsSettings.java b/src/com/android/settings/users/UserDetailsSettings.java index 66c278ed733..8afab9678f4 100644 --- a/src/com/android/settings/users/UserDetailsSettings.java +++ b/src/com/android/settings/users/UserDetailsSettings.java @@ -570,7 +570,9 @@ public class UserDetailsSettings extends SettingsPreferenceFragment *
  • OR multiple admin support is NOT enabled.
    • *
  • OR the current user has DISALLOW_GRANT_ADMIN restriction applied
    • * - *
  • OR the target user ('mUserInfo') is a main user OR a guest user.
    • + *
  • OR the target user ('mUserInfo') is a main user
    • + *
  • OR the target user ('mUserInfo') is not of type + * {@link UserManager#USER_TYPE_FULL_SECONDARY}
    • *
  • OR the target user ('mUserInfo') has DISALLOW_GRANT_ADMIN restriction.
    • * * @@ -582,7 +584,7 @@ public class UserDetailsSettings extends SettingsPreferenceFragment || mUserManager.hasUserRestriction(UserManager.DISALLOW_GRANT_ADMIN); boolean targetUserRestricted = mUserInfo.isMain() - || mUserInfo.isGuest() + || !(UserManager.USER_TYPE_FULL_SECONDARY.equals(mUserInfo.userType)) || mUserManager.hasUserRestrictionForUser(UserManager.DISALLOW_GRANT_ADMIN, mUserInfo.getUserHandle());