diff options
| author | 2020-05-12 03:45:41 +0000 | |
|---|---|---|
| committer | 2020-05-12 03:45:41 +0000 | |
| commit | e3b6e3dc623272ce9cb00964a98d201c0b40a9a7 (patch) | |
| tree | acebd16f9b703ad6ac703411396feb094129a1be | |
| parent | 35a807662fff09f3ac3be47630276dcffa80f591 (diff) | |
| parent | 33ecd88317803ca2d48c64f52441ff5c2124fe08 (diff) | |
Merge "Clarify UM.createUser javadoc" into rvc-dev am: 33ecd88317
Change-Id: Iae5957ef30deba9fc0fc242c3ec02d31c7ce16e0
| -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, |