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

Commit 7135c036 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Make isManagedProfile public."

parents 40a36f90 ade61404

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -36073,6 +36073,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
@@ -7278,7 +7278,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
@@ -1850,10 +1850,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.