summaryrefslogtreecommitdiffstats
path: root/core/java/android/provider
diff options
context:
space:
mode:
authorJulia Reynolds <juliacr@google.com>2014-08-22 11:42:43 -0400
committerJulia Reynolds <juliacr@google.com>2014-08-27 16:25:00 -0400
commitb53453fae037d67e421011936c8fdffe7ba43922 (patch)
treefc6bc2a6580496a82b5391f360d53604c586cc0b /core/java/android/provider
parentc0dce273a8af0263b660b57c1a05395a0bd2d2e5 (diff)
downloadframeworks_base-b53453fae037d67e421011936c8fdffe7ba43922.zip
frameworks_base-b53453fae037d67e421011936c8fdffe7ba43922.tar.gz
frameworks_base-b53453fae037d67e421011936c8fdffe7ba43922.tar.bz2
Audio/Micrphone user restriction/multiuser updates.
1. Persist microphone mute state. 2. Set mute state for correct user. 3. Check for settings restrictions as the correct user. Bug: 17177502 Bug: 16701642 Change-Id: Id8b6cd90c5caceb67fbec862f90aac7ec7a00b3c
Diffstat (limited to 'core/java/android/provider')
-rw-r--r--core/java/android/provider/Settings.java7
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