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

Commit 03f5ff48 authored by Julia Reynolds's avatar Julia Reynolds Committed by Android (Google) Code Review
Browse files

Merge "Unhide UserManager.hasUserRestriction()."

parents 9d46e3ea 2b2cf72f

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -21672,6 +21672,7 @@ package android.os { 
    method public java.util.List<android.os.UserHandle> getUserProfiles();

    method public android.os.Bundle getUserRestrictions();

    method public android.os.Bundle getUserRestrictions(android.os.UserHandle);

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

    method public boolean isUserAGoat();

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

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

core/java/android/os/UserManager.java

+3 −2
Original line number Diff line number Diff line
@@ -481,10 +481,11 @@ public class UserManager { 
    }



    /**

     * @hide

     * Returns whether the current user has been disallowed from performing certain actions

     * or setting certain settings.

     * @param restrictionKey the string key representing the restriction

     *

     * @param restrictionKey The string key representing the restriction.

     * @return {@code true} if the current user has the given restriction, {@code false} otherwise.

     */

    public boolean hasUserRestriction(String restrictionKey) {

        return hasUserRestriction(restrictionKey, Process.myUserHandle());