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

Return default EnforcedAdmin if a user retriction is enforced.

Browse Source 
Test: manual
Bug: 275295245,275061348,235102118
Change-Id: Ie5a36a6620d9466a2f26387ec2954956363d49ff
This commit is contained in:
Jason Parks
2023-03-28 14:19:47 +00:00
parent c4310a6033
commit 088c5fa77c
1 changed files with 7 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
packages/SettingsLib/src/com/android/settingslib/RestrictedLockUtilsInternal.java
View File

@@ -119,29 +119,15 @@ public class RestrictedLockUtilsInternal extends RestrictedLockUtils {
}
final int restrictionSource = enforcingUsers.get(0).getUserRestrictionSource();
final int adminUserId = enforcingUsers.get(0).getUserHandle().getIdentifier();
if (restrictionSource == UserManager.RESTRICTION_SOURCE_PROFILE_OWNER) {
// Check if it is a profile owner of the user under consideration.
if (adminUserId == userId) {
return getProfileOwner(context, userRestriction, adminUserId);
} else {
// Check if it is a profile owner of a managed profile of the current user.
// Otherwise it is in a separate user and we return a default EnforcedAdmin.
final UserInfo parentUser = um.getProfileParent(adminUserId);
return (parentUser != null && parentUser.id == userId)
? getProfileOwner(context, userRestriction, adminUserId)
: EnforcedAdmin.createDefaultEnforcedAdminWithRestriction(userRestriction);
}
} else if (restrictionSource == UserManager.RESTRICTION_SOURCE_DEVICE_OWNER) {
// When the restriction is enforced by device owner, return the device owner admin only
// if the admin is for the {@param userId} otherwise return a default EnforcedAdmin.
return adminUserId == userId
? getDeviceOwner(context, userRestriction)
: EnforcedAdmin.createDefaultEnforcedAdminWithRestriction(userRestriction);
if (restrictionSource == UserManager.RESTRICTION_SOURCE_SYSTEM) {
return null;
}
// If the restriction is enforced by system then return null.
return null;
final EnforcedAdmin admin = getProfileOrDeviceOwner(context, userHandle);
if (admin != null) {
return admin;
}
return EnforcedAdmin.createDefaultEnforcedAdminWithRestriction(userRestriction);
}
public static boolean hasBaseUserRestriction(Context context,