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

Commit fa7b6723 authored by Kenny Guy's avatar Kenny Guy Committed by Android (Google) Code Review
Browse files

Merge "Allow PO to check if it is in a managed profile." into nyc-dev

parents 02424676 ffa3840c

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -5900,6 +5900,7 @@ package android.app.admin { 
    method public boolean isCallerApplicationRestrictionsManagingPackage();

    method public boolean isDeviceOwnerApp(java.lang.String);

    method public boolean isLockTaskPermitted(java.lang.String);

    method public boolean isManagedProfile(android.content.ComponentName);

    method public boolean isMasterVolumeMuted(android.content.ComponentName);

    method public boolean isPackageSuspended(android.content.ComponentName, java.lang.String) throws android.content.pm.PackageManager.NameNotFoundException;

    method public boolean isProfileOwnerApp(java.lang.String);

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -6047,6 +6047,7 @@ package android.app.admin { 
    method public boolean isCallerApplicationRestrictionsManagingPackage();

    method public boolean isDeviceOwnerApp(java.lang.String);

    method public boolean isLockTaskPermitted(java.lang.String);

    method public boolean isManagedProfile(android.content.ComponentName);

    method public boolean isMasterVolumeMuted(android.content.ComponentName);

    method public boolean isPackageSuspended(android.content.ComponentName, java.lang.String) throws android.content.pm.PackageManager.NameNotFoundException;

    method public boolean isProfileOwnerApp(java.lang.String);

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -5904,6 +5904,7 @@ package android.app.admin { 
    method public boolean isCallerApplicationRestrictionsManagingPackage();

    method public boolean isDeviceOwnerApp(java.lang.String);

    method public boolean isLockTaskPermitted(java.lang.String);

    method public boolean isManagedProfile(android.content.ComponentName);

    method public boolean isMasterVolumeMuted(android.content.ComponentName);

    method public boolean isPackageSuspended(android.content.ComponentName, java.lang.String) throws android.content.pm.PackageManager.NameNotFoundException;

    method public boolean isProfileOwnerApp(java.lang.String);

core/java/android/app/admin/DevicePolicyManager.java

+1 −2
Original line number Diff line number Diff line
@@ -5654,10 +5654,9 @@ public class DevicePolicyManager { 
    }



    /**

     * @hide

     * Return if this user is a managed profile of another user. An admin can become the profile

     * owner of a managed profile with {@link #ACTION_PROVISION_MANAGED_PROFILE} and of a managed

     * user with {@link #ACTION_PROVISION_MANAGED_USER}.

     * user with {@link #createAndManageUser}

     * @param admin Which profile owner this request is associated with.

     * @return if this user is a managed profile of another user.

     */