diff options
| author | Adam Bookatz <bookatz@google.com> | 2020-05-12 04:20:55 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-12 04:20:55 +0000 |
| commit | e4ea61c931a48803f3ae4c3a01fef22160968bd2 (patch) | |
| tree | 9f24ead1fdff8b0fd32c4759536cf9523463279f /core/java | |
| parent | a37b229066f344e4f10a9e38da789220837cc332 (diff) | |
| parent | 64074e2d3026bacee5cf09251878852b43e081bc (diff) | |
Merge "Clarify UM.createUser javadoc" into rvc-dev am: 33ecd88317 am: e3b6e3dc62 am: 64074e2d30
Change-Id: I1acc64d461653ad6bcd9a4f4eafb2cc3f8d48439
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, |