Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Unhide UserManager.hasUserRestriction()."

Browse Source
This commit is contained in:
Julia Reynolds
2014-06-09 17:21:37 +00:00
committed by Android (Google) Code Review
parent 9d46e3ea4f 2b2cf72f10
commit 03f5ff482e
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -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);

5
core/java/android/os/UserManager.java
View File

@@ -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());