From 4241d0b8db1c4352956ce877272a9ebe1770ad01 Mon Sep 17 00:00:00 2001
From: Emily Bernier <ember@google.com>
Date: Wed, 28 May 2014 15:51:58 -0400
Subject: [PATCH] Update Settings UI to add new microphone app ops.

Bug: 13585692
Change-Id: I5aa7087621a5d03f14f693a68ed4a4823b91a784
---
 res/values/arrays.xml                                  | 2 ++
 src/com/android/settings/applications/AppOpsState.java | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 4d097200f17..b35a5a171f6 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -625,6 +625,7 @@
         <item>alarm volume</item>
         <item>notification volume</item>
         <item>bluetooth volume</item>
+        <item>mute/unmute microphone</item>
         <item>keep awake</item>
         <item>monitor location</item>
         <item>monitor high power location</item>
@@ -672,6 +673,7 @@
         <item>Alarm volume</item>
         <item>Notification volume</item>
         <item>Bluetooth volume</item>
+        <item>Mute/unmute microphone</item>
         <item>Keep awake</item>
         <item>Location</item>
         <item>Location</item>
diff --git a/src/com/android/settings/applications/AppOpsState.java b/src/com/android/settings/applications/AppOpsState.java
index c3964793f2a..4ef5ef27358 100644
--- a/src/com/android/settings/applications/AppOpsState.java
+++ b/src/com/android/settings/applications/AppOpsState.java
@@ -166,7 +166,8 @@ public class AppOpsState {
                     AppOpsManager.OP_AUDIO_MEDIA_VOLUME,
                     AppOpsManager.OP_AUDIO_ALARM_VOLUME,
                     AppOpsManager.OP_AUDIO_NOTIFICATION_VOLUME,
-                    AppOpsManager.OP_AUDIO_BLUETOOTH_VOLUME, },
+                    AppOpsManager.OP_AUDIO_BLUETOOTH_VOLUME,
+                    AppOpsManager.OP_MUTE_MICROPHONE},
             new boolean[] { false,
                     true,
                     true,