summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Adam Bookatz <bookatz@google.com> 2020-05-11 15:13:36 -0700
committer Adam Bookatz <bookatz@google.com> 2020-05-11 22:22:32 +0000
commita88d4c09e481c536d390b230c3ddeb59f34b698a (patch)
tree03e0dca61ad4c6a5b4a14cac535b5bd490b5ed18
parent3ce5a9b85b7e5435fa586ec7b82bd3f01b8e81d0 (diff)
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
-rw-r--r--core/java/android/os/UserManager.java11
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,