diff options
| author | Julia Reynolds <juliacr@google.com> | 2014-08-28 19:41:41 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-28 19:41:42 +0000 |
| commit | a8528c642090525f0e5f3c35dc3ba5a50ff17093 (patch) | |
| tree | c953dde5077e810fcac88897b5c47afab77204ad /core/java/android/provider | |
| parent | 2db754ac6e2cddf01801c450bb8200b01cddf410 (diff) | |
| parent | b53453fae037d67e421011936c8fdffe7ba43922 (diff) | |
| download | frameworks_base-a8528c642090525f0e5f3c35dc3ba5a50ff17093.zip frameworks_base-a8528c642090525f0e5f3c35dc3ba5a50ff17093.tar.gz frameworks_base-a8528c642090525f0e5f3c35dc3ba5a50ff17093.tar.bz2 | |
Merge "Audio/Micrphone user restriction/multiuser updates." into lmp-dev
Diffstat (limited to 'core/java/android/provider')
| -rw-r--r-- | core/java/android/provider/Settings.java | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 95d1351..ae11f47 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -2113,6 +2113,13 @@ public final class Settings { public static final String VOLUME_MASTER_MUTE = "volume_master_mute"; /** + * Microphone mute (int 1 = mute, 0 = not muted). + * + * @hide + */ + public static final String MICROPHONE_MUTE = "microphone_mute"; + + /** * Whether the notifications should use the ring volume (value of 1) or * a separate notification volume (value of 0). In most cases, users * will have this enabled so the notification and ringer volumes will be |