diff options
| author | 2023-01-08 22:00:28 +0000 | |
|---|---|---|
| committer | 2023-01-08 22:00:28 +0000 | |
| commit | 2d0e68d362fd6c6619b187c50195b3ab9890fbca (patch) | |
| tree | 400280eb180ef84eb44e48e67855f5bae723d7c2 | |
| parent | 30433c97d02ec16b1a07a071a4965d678346282e (diff) | |
| parent | de6b490d72ee67013a16ab55fb870a8478a17b13 (diff) | |
Merge "docs: Explanation on "profile owner on the primary user"" into tm-dev am: de6b490d72
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20403491
Change-Id: I6a7969c7a36c9404a6e2ba854b3e83e32e4015e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | core/java/android/os/UserManager.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/core/java/android/os/UserManager.java b/core/java/android/os/UserManager.java index 0ffdfc6cbcb1..6e2f15948202 100644 --- a/core/java/android/os/UserManager.java +++ b/core/java/android/os/UserManager.java @@ -595,8 +595,11 @@ public class UserManager { /** * Specifies if a user is disallowed from transferring files over USB. * - * <p>This restriction can only be set by a device owner, a profile owner on the primary - * user or a profile owner of an organization-owned managed profile on the parent profile. + * <p>This restriction can only be set by a <a href="https://developers.google.com/android/work/terminology#device_owner_do"> + * device owner</a> or a <a href="https://developers.google.com/android/work/terminology#profile_owner_po"> + * profile owner</a> on the primary user's profile or a profile owner of an organization-owned + * <a href="https://developers.google.com/android/work/terminology#managed_profile"> + * managed profile</a> on the parent profile. * When it is set by a device owner, it applies globally. When it is set by a profile owner * on the primary user or by a profile owner of an organization-owned managed profile on * the parent profile, it disables the primary user from transferring files over USB. No other |