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

am e450c3cd: Merge "Fix docs build." into jb-mr2-dev

Browse Source 
* commit 'e450c3cd8d135972eaa8237f1d4587ed7d887c2f':
  Fix docs build.
This commit is contained in:
Amith Yamasani
2013-03-26 16:26:47 -07:00
committed by Android Git Automerger
parent 09f4d8198a e450c3cd8d
commit 8813998628
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -224,7 +224,7 @@ public class UserManager {
/**
* Sets all the user-wide restrictions for this user.
* Requires the {@link android.Manifest.permission#MANAGE_USERS} permission.
* Requires the MANAGE_USERS permission.
* @param restrictions the Bundle containing all the restrictions.
*/
public void setUserRestrictions(Bundle restrictions) {
@@ -233,7 +233,7 @@ public class UserManager {
/**
* Sets all the user-wide restrictions for the specified user.
* Requires the {@link android.Manifest.permission#MANAGE_USERS} permission.
* Requires the MANAGE_USERS permission.
* @param restrictions the Bundle containing all the restrictions.
* @param userHandle the UserHandle of the user for whom to set the restrictions.
*/
@@ -247,10 +247,9 @@ public class UserManager {
/**
* Sets the value of a specific restriction.
* Requires the {@link android.Manifest.permission#MANAGE_USERS} permission.
* Requires the MANAGE_USERS permission.
* @param key the key of the restriction
* @param value the value for the restriction
* @param userHandle the user whose restriction is to be changed.
*/
public void setUserRestriction(String key, boolean value) {
Bundle bundle = getUserRestrictions();