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

Commit ade61404 authored by Jonathan Scott's avatar Jonathan Scott
Browse files

Make isManagedProfile public. 

Test: atest com.android.cts.devicepolicy.ManagedProfileTest#userManagerIsManagedProfileReturnsCorrectValues
Fixes: 146123237
Change-Id: Iedfed3b6cb4c76c533c6ffe7bf3272f69fce14ea
parent 2753e748

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -35717,6 +35717,7 @@ package android.os { 
    method @RequiresPermission(anyOf={"android.permission.MANAGE_USERS", "android.permission.INTERACT_ACROSS_USERS"}, conditional=true) public android.os.Bundle getUserRestrictions(android.os.UserHandle);

    method public boolean hasUserRestriction(String);

    method public boolean isDemoUser();

    method public boolean isManagedProfile();

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

    method public boolean isSystemUser();

    method public boolean isUserAGoat();

api/system-current.txt

+0 −1
Original line number Diff line number Diff line
@@ -6734,7 +6734,6 @@ package android.os { 
    method @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.INTERACT_ACROSS_USERS}, conditional=true) public boolean hasUserRestrictionForUser(@NonNull String, @NonNull android.os.UserHandle);

    method @RequiresPermission(android.Manifest.permission.MANAGE_USERS) public boolean isAdminUser();

    method @RequiresPermission(android.Manifest.permission.MANAGE_USERS) public boolean isGuestUser();

    method @RequiresPermission(android.Manifest.permission.MANAGE_USERS) public boolean isManagedProfile();

    method @RequiresPermission(android.Manifest.permission.MANAGE_USERS) public boolean isManagedProfile(int);

    method @RequiresPermission(android.Manifest.permission.MANAGE_USERS) public boolean isPrimaryUser();

    method @RequiresPermission(android.Manifest.permission.MANAGE_USERS) public boolean isRestrictedProfile();

core/java/android/os/UserManager.java

+0 −3
Original line number Diff line number Diff line
@@ -1841,10 +1841,7 @@ public class UserManager { 
     * Checks if the calling app is running in a managed profile.

     *

     * @return whether the caller is in a managed profile.

     * @hide

     */

    @SystemApi

    @RequiresPermission(android.Manifest.permission.MANAGE_USERS)

    public boolean isManagedProfile() {

        // No need for synchronization.  Once it becomes non-null, it'll be non-null forever.

        // Worst case we might end up calling the AIDL method multiple times but that's fine.