Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Clarify UM.createUser javadoc" into rvc-dev am: 33ecd88317 am: e3b6e3dc62

Browse Source 
Change-Id: I624c6a22f5fbb5b1f373c136b3a664bab28e724a
This commit is contained in:
Adam Bookatz
2020-05-12 04:07:44 +00:00
committed by Automerger Merge Worker
parent bd0e4f8e6e e3b6e3dc62
commit 64074e2d30
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/java/android/os/UserManager.java
View File

@@ -2582,8 +2582,8 @@ public class UserManager {
} }
/** /**
* Creates a user with the specified name and options. For non-admin users, default user * Creates a user with the specified name and options.
* restrictions are going to be applied. * Default user restrictions will be applied.
* Requires {@link android.Manifest.permission#MANAGE_USERS} permission. * Requires {@link android.Manifest.permission#MANAGE_USERS} permission.
* *
* @param name the user's name * @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 * Creates a user with the specified name and options.
* restrictions will be applied. * Default user restrictions will be applied.
* *
* <p>Requires {@link android.Manifest.permission#MANAGE_USERS}. * <p>Requires {@link android.Manifest.permission#MANAGE_USERS}.
* {@link android.Manifest.permission#CREATE_USERS} suffices if flags are in * {@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 * Pre-creates a user of the specified type. Default user restrictions will be applied.
* restrictions will be applied.
* *
* <p>This method can be used by OEMs to "warm" up the user creation by pre-creating some users * <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, * at the first boot, so they when the "real" user is created (for example,