Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7ca9c2fd authored by Adam Bookatz's avatar Adam Bookatz Committed by Android (Google) Code Review
Browse files

Merge "isRestrictedProfile() allowed for QUERY_USERS"

parents 22697d99 7e535884

core/api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -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);

core/java/android/os/UserManager.java

+6 −3
Original line number Diff line number Diff line
@@ -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 {

services/core/java/com/android/server/pm/UserManagerService.java

+1 −1
Original line number Diff line number Diff line
@@ -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);