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

Merge "isRestrictedProfile() allowed for QUERY_USERS"

Browse Source
This commit is contained in:
Adam Bookatz
2023-03-15 02:08:41 +00:00
committed by Android (Google) Code Review
parent 22697d992f 7e5358842a
commit 7ca9c2fd3f
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/api/system-current.txt
View File

@@ -10971,7 +10971,7 @@ package android.os {
method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.CREATE_USERS, android.Manifest.permission.QUERY_USERS}) public boolean isPrimaryUser();
method public static boolean isRemoveResultSuccessful(int);
method public boolean isRestrictedProfile();
method @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.CREATE_USERS}, conditional=true) public boolean isRestrictedProfile(@NonNull android.os.UserHandle);
method @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.CREATE_USERS, android.Manifest.permission.QUERY_USERS}, conditional=true) public boolean isRestrictedProfile(@NonNull android.os.UserHandle);
method @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.QUERY_USERS}) public boolean isSameProfileGroup(@NonNull android.os.UserHandle, @NonNull android.os.UserHandle);
method @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.CREATE_USERS, android.Manifest.permission.QUERY_USERS, android.Manifest.permission.GET_ACCOUNTS_PRIVILEGED}) public boolean isUserNameSet();
method @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.CREATE_USERS, android.Manifest.permission.QUERY_USERS}) public boolean isUserOfType(@NonNull String);

9
core/java/android/os/UserManager.java
View File

@@ -2582,7 +2582,8 @@ public class UserManager {
enabledSinceTargetSdkVersion = Build.VERSION_CODES.TIRAMISU,
requiresAnyOfPermissionsIfNotCaller = {
android.Manifest.permission.MANAGE_USERS,
android.Manifest.permission.CREATE_USERS}
android.Manifest.permission.CREATE_USERS,
android.Manifest.permission.QUERY_USERS}
)
public boolean isLinkedUser() {
return isRestrictedProfile();
@@ -2600,7 +2601,8 @@ public class UserManager {
enabledSinceTargetSdkVersion = Build.VERSION_CODES.TIRAMISU,
requiresAnyOfPermissionsIfNotCaller = {
android.Manifest.permission.MANAGE_USERS,
android.Manifest.permission.CREATE_USERS}
android.Manifest.permission.CREATE_USERS,
android.Manifest.permission.QUERY_USERS}
)
public boolean isRestrictedProfile() {
try {
@@ -2621,7 +2623,8 @@ public class UserManager {
@SystemApi
@RequiresPermission(anyOf = {
Manifest.permission.MANAGE_USERS,
Manifest.permission.CREATE_USERS},
Manifest.permission.CREATE_USERS,
Manifest.permission.QUERY_USERS},
conditional = true)
public boolean isRestrictedProfile(@NonNull UserHandle user) {
try {

2
services/core/java/com/android/server/pm/UserManagerService.java
View File

@@ -2252,7 +2252,7 @@ public class UserManagerService extends IUserManager.Stub {
@Override
public boolean isRestricted(@UserIdInt int userId) {
if (userId != UserHandle.getCallingUserId()) {
checkCreateUsersPermission("query isRestricted for user " + userId);
checkQueryOrCreateUsersPermission("query isRestricted for user " + userId);
}
synchronized (mUsersLock) {
final UserInfo userInfo = getUserInfoLU(userId);