diff options
| author | Alex Johnston <acjohnston@google.com> | 2020-05-07 15:32:29 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-07 15:32:29 +0000 |
| commit | 4fc5898a3facea310058a6286e259ad39f8fddd2 (patch) | |
| tree | 0e3ec1714efbb1809f8ecf9cc6e3e711e8d772ae /core/java | |
| parent | 5833e35ba5c0cf7fb9c251bca46c2f8829763521 (diff) | |
| parent | 80542add04f3e77e6d63e7383ffd57722f5f2435 (diff) | |
Merge "Restrict creation of secondary users" into rvc-dev am: 80542add04
Change-Id: I52fcb4103b0119ed6039a53374703e1d7af0bc12
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/os/UserManager.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/core/java/android/os/UserManager.java b/core/java/android/os/UserManager.java index 187274a837a0..7912dacac377 100644 --- a/core/java/android/os/UserManager.java +++ b/core/java/android/os/UserManager.java @@ -635,10 +635,11 @@ public class UserManager { /** * Specifies if a user is disallowed from adding new users. This can only be set by device - * owners, profile owners on the primary user or profile owners of organization-owned managed - * profiles on the parent profile. The default value is <code>false</code>. + * owners or profile owners on the primary user. The default value is <code>false</code>. * <p>This restriction has no effect on secondary users and managed profiles since only the * primary user can add other users. + * <p> When the device is an organization-owned device provisioned with a managed profile, + * this restriction will be set as a base restriction which cannot be removed by any admin. * * <p>Key for user restrictions. * <p>Type: Boolean |