am 73db0682: Merge "Restore permission check for mic muting" into lmp-dev

* commit '73db06820184c39c4e50e5be268a9e0f213a1a99': Restore permission check for mic muting
2014-09-02 20:35:36 +00:00
parent e4f8bf1011 859f4f7272
commit 600b78c6a8
1 changed files with 3 additions and 0 deletions
--- a/media/java/android/media/AudioService.java
+++ b/media/java/android/media/AudioService.java
@@ -1564,6 +1564,9 @@ public class AudioService extends IAudioService.Stub {
                callingPackage) != AppOpsManager.MODE_ALLOWED) {
            return;
        }
+        if (!checkAudioSettingsPermission("setMicrophoneMute()")) {
+            return;
+        }

        AudioSystem.muteMicrophone(on);
        // Post a persist microphone msg.