summaryrefslogtreecommitdiff
path: root/core/java/android/os/UserManager.java
diff options
context:
space:
mode:
authorWen ZHANG <wenzhang@google.com>2017-08-23 14:27:02 +0100
committerWen ZHANG <wenzhang@google.com>2017-08-23 14:32:59 +0100
commit61ed0dc033c6aeeb36c2a2a5b5c9701d141fe4be (patch)
tree8ef40098a0a0cbd435230c0023c2fabff2e460f0 /core/java/android/os/UserManager.java
parent262eddad068429c0d67c8f6573f8a9f8694da4aa (diff)
Update javadoc of UserManager#DISALLOW_ADJUST_VOLUME
Profile owners are not allowed setting this restriction until the N release. Test: No test as it only touches javadocs Change-Id: I793e2c3b5270ee00e451551e68567e8995f31d1c
Diffstat (limited to 'core/java/android/os/UserManager.java')
-rw-r--r--core/java/android/os/UserManager.java7
1 files changed, 5 insertions, 2 deletions
diff --git a/core/java/android/os/UserManager.java b/core/java/android/os/UserManager.java
index 794b3baf1932..2e9cb7067f08 100644
--- a/core/java/android/os/UserManager.java
+++ b/core/java/android/os/UserManager.java
@@ -495,8 +495,11 @@ public class UserManager {
/**
* 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>.
+ * will be muted. This can be set by device owners from API 21 and profile owners from API 24.
+ * The default value is <code>false</code>.
+ *
+ * <p>When the restriction is set by profile owners, then it only applies to relevant
+ * profiles.
*
* <p>This restriction has no effect on managed profiles.
* <p>Key for user restrictions.