Commit: 5e851cf9d895ec23e52dc32a6091480e584d0980 - frameworks-base (git)

frameworks/base

Commit MetaInfo

• Révision: 5e851cf9d895ec23e52dc32a6091480e584d0980 (tree)
• l'heure: 2019-12-19 06:24:16
• Auteur: Jean-Michel Trivi <jmtrivi@goog...>
• Commiter: Bryan Ferris

Message de Log

AudioService: setMasterMute protected by MODIFY_AUDIO_ROUTING

Require MODIFY_AUDIO_ROUTING system permission to exercise
hidden (non-SDK, non-SystemApi) method setMasterMute

Bug: 141622311
Test: see bug for POC app
Change-Id: I4ee93276daa1285c55c4c838e2b43833135d76f6

Change Summary

• modified: media/java/android/media/AudioManager.java
• modified: services/core/java/com/android/server/audio/AudioService.java

Modification

--- a/media/java/android/media/AudioManager.java
+++ b/media/java/android/media/AudioManager.java
@@ -908,6 +908,7 @@ public class AudioManager {
 
     /** @hide */
     @UnsupportedAppUsage
+    @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING)
     public void setMasterMute(boolean mute, int flags) {
         final IAudioService service = getService();
         try {

--- a/services/core/java/com/android/server/audio/AudioService.java
+++ b/services/core/java/com/android/server/audio/AudioService.java
@@ -2790,6 +2790,7 @@ public class AudioService extends IAudioService.Stub
     }
 
     public void setMasterMute(boolean mute, int flags, String callingPackage, int userId) {
+        enforceModifyAudioRoutingPermission();
         setMasterMuteInternal(mute, flags, callingPackage, Binder.getCallingUid(),
                 userId);
     }