Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix javadoc for some user restrictions." into oc-dev

Browse Source 
am: 9c8bb68071

Change-Id: I0c77cdfdf173f50701ce2cf52a3004b6297ff369
This commit is contained in:
Pavel Grafov
2017-04-21 16:35:09 +00:00
committed by android-build-merger
parent 5cdb654cbd 9c8bb68071
commit 9488302c42
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/java/android/os/UserManager.java
View File

@@ -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)