Merge "Restore permission check for mic muting" into lmp-dev

2014-09-02 20:22:58 +00:00
parent 8c94a8f280 4a4fea0752
commit 859f4f7272
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.