Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Read new value of admin status on UserCapabilities update" into main

Browse Source
This commit is contained in:
Tetiana Meronyk
2024-08-15 15:10:46 +00:00
committed by Android (Google) Code Review
parent 84cb2f6a02 56446fa3b8
commit c8c5ac7be1
2 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/users/UserCapabilities.java
View File

@@ -76,6 +76,9 @@ public class UserCapabilities {
public void updateAddUserCapabilities(Context context) { public void updateAddUserCapabilities(Context context) {
final UserManager userManager = final UserManager userManager =
(UserManager) context.getSystemService(Context.USER_SERVICE); (UserManager) context.getSystemService(Context.USER_SERVICE);
final UserInfo myUserInfo = userManager.getUserInfo(UserHandle.myUserId());
mIsAdmin = myUserInfo.isAdmin();
mEnforcedAdmin = RestrictedLockUtilsInternal.checkIfRestrictionEnforced(context, mEnforcedAdmin = RestrictedLockUtilsInternal.checkIfRestrictionEnforced(context,
UserManager.DISALLOW_ADD_USER, UserHandle.myUserId()); UserManager.DISALLOW_ADD_USER, UserHandle.myUserId());
final boolean hasBaseUserRestriction = RestrictedLockUtilsInternal.hasBaseUserRestriction( final boolean hasBaseUserRestriction = RestrictedLockUtilsInternal.hasBaseUserRestriction(

11
tests/robotests/src/com/android/settings/users/UserCapabilitiesTest.java
View File

@@ -80,6 +80,17 @@ public class UserCapabilitiesTest {
assertThat(userCapabilities.mDisallowSwitchUser).isFalse(); assertThat(userCapabilities.mDisallowSwitchUser).isFalse();
} }
@Test
public void changeAdminStatus_updateUserCapabilities_mIsAdminGetsUpdated() {
mUserManager.setIsAdminUser(false);
UserCapabilities userCapabilities = UserCapabilities.create(mContext);
assertThat(userCapabilities.isAdmin()).isFalse();
mUserManager.setIsAdminUser(true);
userCapabilities.updateAddUserCapabilities(mContext);
assertThat(userCapabilities.mIsAdmin).isTrue();
}
@Test @Test
public void userSwitchEnabled_off() { public void userSwitchEnabled_off() {
mUserManager.setUserSwitcherEnabled(false); mUserManager.setUserSwitcherEnabled(false);