diff options
| author | Adam Bookatz <bookatz@google.com> | 2020-05-12 03:26:35 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-05-12 03:26:35 +0000 |
| commit | 33ecd88317803ca2d48c64f52441ff5c2124fe08 (patch) | |
| tree | fe12880d1547604185b3d5a1ed3ae1594f748662 /core/java | |
| parent | e710cbeabe72123ff02e8211cdbec21e9639ede6 (diff) | |
| parent | a88d4c09e481c536d390b230c3ddeb59f34b698a (diff) | |
Merge "Clarify UM.createUser javadoc" into rvc-dev
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/os/UserManager.java | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/core/java/android/os/UserManager.java b/core/java/android/os/UserManager.java index 236ea0088062..25bf43043422 100644 --- a/core/java/android/os/UserManager.java +++ b/core/java/android/os/UserManager.java @@ -2582,8 +2582,8 @@ public class UserManager { } /** - * Creates a user with the specified name and options. For non-admin users, default user - * restrictions are going to be applied. + * Creates a user with the specified name and options. + * Default user restrictions will be applied. * Requires {@link android.Manifest.permission#MANAGE_USERS} permission. * * @param name the user's name @@ -2602,8 +2602,8 @@ public class UserManager { } /** - * Creates a user with the specified name and options. For non-admin users, default user - * restrictions will be applied. + * Creates a user with the specified name and options. + * Default user restrictions will be applied. * * <p>Requires {@link android.Manifest.permission#MANAGE_USERS}. * {@link android.Manifest.permission#CREATE_USERS} suffices if flags are in @@ -2637,8 +2637,7 @@ public class UserManager { } /** - * Pre-creates a user of the specified type. For non-admin users, default user - * restrictions will be applied. + * Pre-creates a user of the specified type. Default user restrictions will be applied. * * <p>This method can be used by OEMs to "warm" up the user creation by pre-creating some users * at the first boot, so they when the "real" user is created (for example, |