commit 03a951634b2e3bfb496c8fdc23d95e35191216c9
author Jean-Michel Trivi <jmtrivi@google.com> Mon Oct 14 16:02:09 2024 -0700
committer Jean-Michel Trivi <jmtrivi@google.com> Mon Oct 21 03:28:24 2024 +0000
tree b18cec38a17eb16b6685fc12fc0347a3aaf254a2
parent 8731e6024299a595edb9d3f35e5348a1a1f93af1

AudioService: fix permission for addOnDevicesForAttributesChanged

Bug: 352303112
Flag: EXEMPT security
Test: atest CtsMediaAudioTestCases:DevicesForAttributesTest
Change-Id: I10eba687a2e33fe5d9bb39c32c20761ab82d8f50

media/java/android/media/IAudioService.aidl

diff --git a/media/java/android/media/IAudioService.aidl b/media/java/android/media/IAudioService.aidl
index 02ca307..c22b674 100644
--- a/media/java/android/media/IAudioService.aidl
+++ b/media/java/android/media/IAudioService.aidl
@@ -471,6 +471,7 @@
 
     List<AudioDeviceAttributes> getDevicesForAttributesUnprotected(in AudioAttributes attributes);
 
+    @EnforcePermission(anyOf = {"MODIFY_AUDIO_ROUTING", "QUERY_AUDIO_STATE"})
     void addOnDevicesForAttributesChangedListener(in AudioAttributes attributes,
             in IDevicesForAttributesCallback callback);
 

services/core/java/com/android/server/audio/AudioService.java

diff --git a/services/core/java/com/android/server/audio/AudioService.java b/services/core/java/com/android/server/audio/AudioService.java
index 37a2fba..78a1fa7 100644
--- a/services/core/java/com/android/server/audio/AudioService.java
+++ b/services/core/java/com/android/server/audio/AudioService.java
@@ -3567,8 +3567,10 @@
      * @see AudioManager#addOnDevicesForAttributesChangedListener(
      *      AudioAttributes, Executor, OnDevicesForAttributesChangedListener)
      */
+    @android.annotation.EnforcePermission(anyOf = { MODIFY_AUDIO_ROUTING, QUERY_AUDIO_STATE })
     public void addOnDevicesForAttributesChangedListener(AudioAttributes attributes,
             IDevicesForAttributesCallback callback) {
+        super.addOnDevicesForAttributesChangedListener_enforcePermission();
         mAudioSystem.addOnDevicesForAttributesChangedListener(
                 attributes, false /* forVolume */, callback);
     }