diff --git a/core/api/current.txt b/core/api/current.txt index b672baab56a65..b9c747d1ba28a 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -32055,6 +32055,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(); diff --git a/core/api/system-current.txt b/core/api/system-current.txt index fd716f341540a..5bf9bb9f1b1eb 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -9674,7 +9674,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); diff --git a/core/java/android/os/UserManager.java b/core/java/android/os/UserManager.java index 7b8d34b3b5704..7b4c7de1341b9 100644 --- a/core/java/android/os/UserManager.java +++ b/core/java/android/os/UserManager.java @@ -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,