diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2017-04-21 16:28:45 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-04-21 16:28:49 +0000 |
| commit | 9c8bb6807113cfd2e45ec52818ab93099a3a0993 (patch) | |
| tree | d83e051153aa9356b021d79514d8aa23467f345d /core/java/android | |
| parent | 21b5f4063eeb3ade474f1970bb0880c3c84385a7 (diff) | |
| parent | ce3e1a3c5fb881ebdea6ba219dae68c9b63ba108 (diff) | |
Merge "Fix javadoc for some user restrictions." into oc-dev
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/os/UserManager.java | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/core/java/android/os/UserManager.java b/core/java/android/os/UserManager.java index 6f4c9cf7d7ff..f95a34cd7ec8 100644 --- a/core/java/android/os/UserManager.java +++ b/core/java/android/os/UserManager.java @@ -455,10 +455,11 @@ public class UserManager { public static final String DISALLOW_MOUNT_PHYSICAL_MEDIA = "no_physical_media"; /** - * Specifies if a user is disallowed from adjusting microphone - * volume. If set, the microphone will be muted. This can only be set by device owners - * and profile owners on the primary user. The default value is <code>false</code>. + * Specifies if a user is disallowed from adjusting microphone volume. If set, the microphone + * will be muted. This can be set by device owners and profile owners. The default value is + * <code>false</code>. * + * <p>This restriction has no effect on managed profiles. * <p>Key for user restrictions. * <p>Type: Boolean * @see DevicePolicyManager#addUserRestriction(ComponentName, String) @@ -468,10 +469,11 @@ public class UserManager { public static final String DISALLOW_UNMUTE_MICROPHONE = "no_unmute_microphone"; /** - * Specifies if a user is disallowed from adjusting the master - * volume. If set, the master volume will be muted. This can only be set by device owners - * and profile owners on the primary user. The default value is <code>false</code>. + * Specifies if a user is disallowed from adjusting the master volume. If set, the master volume + * will be muted. This can be set by device owners and profile owners. The default value is + * <code>false</code>. * + * <p>This restriction has no effect on managed profiles. * <p>Key for user restrictions. * <p>Type: Boolean * @see DevicePolicyManager#addUserRestriction(ComponentName, String) |