From a88d4c09e481c536d390b230c3ddeb59f34b698a Mon Sep 17 00:00:00 2001 From: Adam Bookatz Date: Mon, 11 May 2020 15:13:36 -0700 Subject: [PATCH] Clarify UM.createUser javadoc When creating admin users, default UserRestrictions do indeed apply, so updating the javadoc. Test: N/A Bug: 143491938 Change-Id: Id495599abd4ddee100ca2c761d3b420fff315482 --- core/java/android/os/UserManager.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/core/java/android/os/UserManager.java b/core/java/android/os/UserManager.java index 236ea0088062f..25bf430434224 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. * *

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. * *

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,