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

Commit 03c3473c authored by Kholoud Mohamed's avatar Kholoud Mohamed Committed by Android (Google) Code Review
Browse files

Merge "Expose UserManager#isProfile as a public API"

parents 16e1bd9a e4d4cbd5

core/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -32034,6 +32034,7 @@ package android.os { 
    method public boolean isDemoUser();

    method public static boolean isHeadlessSystemUserMode();

    method public boolean isManagedProfile();

    method public boolean isProfile();

    method public boolean isQuietModeEnabled(android.os.UserHandle);

    method public boolean isSystemUser();

    method public boolean isUserAGoat();

core/api/system-current.txt

+0 −1
Original line number Diff line number Diff line
@@ -9648,7 +9648,6 @@ package android.os { 
    method @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.QUERY_USERS, android.Manifest.permission.INTERACT_ACROSS_USERS}, conditional=true) public boolean isManagedProfile(int);

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

    method @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.CREATE_USERS, android.Manifest.permission.QUERY_USERS}) public boolean isPrimaryUser();

    method public boolean isProfile();

    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.QUERY_USERS}) public boolean isSameProfileGroup(@NonNull android.os.UserHandle, @NonNull android.os.UserHandle);

core/java/android/os/UserManager.java

+3 −3
Original line number Diff line number Diff line
@@ -2509,12 +2509,12 @@ public class UserManager { 
    }



    /**

     * Checks if the calling context user is running in a profile.

     * Checks if the calling context user is running in a profile. A profile is a user that

     * typically has its own separate data but shares its UI with some parent user. For example, a

     * {@link #isManagedProfile() managed profile} is a type of profile.

     *

     * @return whether the caller is in a profile.

     * @hide

     */

    @SystemApi

    @UserHandleAware(

            requiresAnyOfPermissionsIfNotCallerProfileGroup = {

                    android.Manifest.permission.MANAGE_USERS,