Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ce3e1a3c authored by Pavel Grafov's avatar Pavel Grafov
Browse files

Fix javadoc for some user restrictions. 

DISALLOW_UNMUTE_MICROPHONE and DISALLOW_ADJUST_VOLUME can
be set by POs on secondary users as well. But they have no
effect on managed profiles.

(In the bug I erroneously mentionted DISALLOW_UNMUTE_DEVICE
which is @hidden instead of *_MICROPHONE).

Bug: 36024135
Test: IntelliJ quickdoc popup renders correctly.
Change-Id: I7a0e77ac993846cdc3a4ddf4d457e1282872107f
parent 337be5a1

core/java/android/os/UserManager.java

+8 −6
Original line number Diff line number Diff line
@@ -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)