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

Commit c7f3fb51 authored by Adam Bookatz's avatar Adam Bookatz
Browse files

isMediaSharedWithParent UserHandleAware javadoc 

Using the standard format for describing the UserHandleAware situation
of this API (e.g. same as isCredentialSharableWithParent has).

Test: N/A. Just javadoc.
Change-Id: I3b9f79af286ac1f4628824899db04fc0a454486a
parent 92ef76b2

core/api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -9817,7 +9817,7 @@ package android.os { 
    method public boolean isCredentialSharableWithParent();

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

    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 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 static boolean isRemoveResultSuccessful(int);

    method public boolean isRestrictedProfile();

core/java/android/os/UserManager.java

+4 −7
Original line number Diff line number Diff line
@@ -4854,17 +4854,14 @@ public class UserManager { 
     * shares media with its parent user (the user that created this profile).

     * Returns false for any other type of user.

     *

     * <p>Requires {@link android.Manifest.permission#MANAGE_USERS} or

     * {@link android.Manifest.permission#INTERACT_ACROSS_USERS} permission, otherwise the

     * caller must be in the same profile group as the user.

     *

     * @return true if the user shares media with its parent user, false otherwise.

     * @hide

     */

    @SystemApi

    @RequiresPermission(anyOf = {android.Manifest.permission.MANAGE_USERS,

            Manifest.permission.INTERACT_ACROSS_USERS}, conditional = true)

    @UserHandleAware

    @UserHandleAware(

            requiresAnyOfPermissionsIfNotCallerProfileGroup = {

                    Manifest.permission.MANAGE_USERS,

                    Manifest.permission.INTERACT_ACROSS_USERS})

    @SuppressAutoDoc

    public boolean isMediaSharedWithParent() {

        try {