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

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

Merge "Clarify isUserVisible/isUserForeground perms" into main

parents dfba04e2 c8d8de3c

core/api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -10482,7 +10482,7 @@ package android.os { 
    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);

    method @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.INTERACT_ACROSS_USERS}, conditional=true) public boolean isUserUnlockingOrUnlocked(@NonNull android.os.UserHandle);

    method @RequiresPermission(anyOf={"android.permission.INTERACT_ACROSS_USERS", "android.permission.MANAGE_USERS"}) public boolean isUserVisible();

    method public boolean isUserVisible();

    method @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.CREATE_USERS}) public boolean removeUser(@NonNull android.os.UserHandle);

    method @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.CREATE_USERS}) public int removeUserWhenPossible(@NonNull android.os.UserHandle, boolean);

    method @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.CREATE_USERS}) public void setBootUser(@NonNull android.os.UserHandle);

core/java/android/os/UserManager.java

+8 −6
Original line number Diff line number Diff line
@@ -3330,7 +3330,10 @@ public class UserManager { 
     *

     * @return whether the context user is running in the foreground.

     */

    @UserHandleAware

    @UserHandleAware(

            requiresAnyOfPermissionsIfNotCaller = {

                    android.Manifest.permission.MANAGE_USERS,

                    android.Manifest.permission.INTERACT_ACROSS_USERS})

    public boolean isUserForeground() {

        try {

            return mService.isUserForeground(mUserId);
@@ -3404,11 +3407,10 @@ public class UserManager { 
     * @hide

     */

    @SystemApi

    @UserHandleAware

    @RequiresPermission(anyOf = {

            "android.permission.INTERACT_ACROSS_USERS",

            "android.permission.MANAGE_USERS"

    })

    @UserHandleAware(

            requiresAnyOfPermissionsIfNotCaller = {

                    android.Manifest.permission.MANAGE_USERS,

                    android.Manifest.permission.INTERACT_ACROSS_USERS})

    public boolean isUserVisible() {

        try {

            return mService.isUserVisible(mUserId);