diff options
| author | Amith Yamasani <yamasani@google.com> | 2012-08-22 10:31:30 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-08-22 10:31:30 -0700 |
| commit | 98dddda7912428241ed61c053c7300d4a6702fa7 (patch) | |
| tree | 2e247db37e3ba9687b992c056c9c4b016709290b /core/java/android/os | |
| parent | 6479ecd1b24e9d5a5636130cb4b0c353b396ff0e (diff) | |
| parent | 1952637425eece18aa1ce3d80d4b49086ef3bcf7 (diff) | |
| download | frameworks_base-98dddda7912428241ed61c053c7300d4a6702fa7.zip frameworks_base-98dddda7912428241ed61c053c7300d4a6702fa7.tar.gz frameworks_base-98dddda7912428241ed61c053c7300d4a6702fa7.tar.bz2 | |
Merge "Remove permission requirement for some UserManager calls" into jb-mr1-dev
Diffstat (limited to 'core/java/android/os')
| -rw-r--r-- | core/java/android/os/UserManager.java | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/core/java/android/os/UserManager.java b/core/java/android/os/UserManager.java index 0338ee7..de8e78c 100644 --- a/core/java/android/os/UserManager.java +++ b/core/java/android/os/UserManager.java @@ -56,6 +56,7 @@ public class UserManager { /** * Returns the user name of the user making this call. + * Requires {@link android.Manifest.permission#MANAGE_USERS} permission. * @return the user name */ public String getUserName() { @@ -69,6 +70,7 @@ public class UserManager { /** * Returns the UserInfo object describing a specific user. + * Requires {@link android.Manifest.permission#MANAGE_USERS} permission. * @param userHandle the user handle of the user whose information is being requested. * @return the UserInfo object for a specific user. * @hide @@ -84,6 +86,7 @@ public class UserManager { /** * Creates a user with the specified name and options. + * Requires {@link android.Manifest.permission#MANAGE_USERS} permission. * * @param name the user's name * @param flags flags that identify the type of user and other properties. @@ -103,6 +106,7 @@ public class UserManager { /** * Returns information for all users on this device. + * Requires {@link android.Manifest.permission#MANAGE_USERS} permission. * @return the list of users that were created. * @hide */ @@ -117,6 +121,7 @@ public class UserManager { /** * Removes a user and all associated data. + * Requires {@link android.Manifest.permission#MANAGE_USERS} permission. * @param userHandle the integer handle of the user, where 0 is the primary user. * @hide */ @@ -131,6 +136,7 @@ public class UserManager { /** * Updates the user's name. + * Requires {@link android.Manifest.permission#MANAGE_USERS} permission. * * @param userHandle the user's integer handle * @param name the new name for the user @@ -162,6 +168,7 @@ public class UserManager { /** * Enable or disable the use of a guest account. If disabled, the existing guest account * will be wiped. + * Requires {@link android.Manifest.permission#MANAGE_USERS} permission. * @param enable whether to enable a guest account. * @hide */ @@ -175,6 +182,7 @@ public class UserManager { /** * Checks if a guest user is enabled for this device. + * Requires {@link android.Manifest.permission#MANAGE_USERS} permission. * @return whether a guest user is enabled * @hide */ @@ -189,6 +197,7 @@ public class UserManager { /** * Wipes all the data for a user, but doesn't remove the user. + * Requires {@link android.Manifest.permission#MANAGE_USERS} permission. * @param userHandle * @hide */ |