diff options
| author | 2025-03-18 12:15:28 -0700 | |
|---|---|---|
| committer | 2025-03-18 12:16:19 -0700 | |
| commit | b1ca8f99b1caf4f4529005b04d60c0d336227376 (patch) | |
| tree | 6ef5315bd63d97c41921a16a64c5c4db0d46e698 | |
| parent | 76e3bf9a04746763e689e1b9237dffade6f246b9 (diff) | |
Revert "Add MODIFY_AUDIO_SETTINGS_PRIVILEGED permission check to volume callback"
This reverts commit 76e3bf9a04746763e689e1b9237dffade6f246b9.
Reason for revert: Causing failures for non phone builds, see b/404490474
Change-Id: I22d8fd4f39d7285a9fd423be511eba759928334c
| -rw-r--r-- | media/java/android/media/IAudioService.aidl | 2 | ||||
| -rw-r--r-- | media/tests/AudioPolicyTest/AndroidManifest.xml | 1 | ||||
| -rw-r--r-- | services/core/java/com/android/server/audio/AudioService.java | 6 |
3 files changed, 0 insertions, 9 deletions
diff --git a/media/java/android/media/IAudioService.aidl b/media/java/android/media/IAudioService.aidl index c505bcee0332..b97b943113b6 100644 --- a/media/java/android/media/IAudioService.aidl +++ b/media/java/android/media/IAudioService.aidl @@ -447,10 +447,8 @@ interface IAudioService { boolean isAudioServerRunning(); - @EnforcePermission("MODIFY_AUDIO_SETTINGS_PRIVILEGED") void registerAudioVolumeCallback(IAudioVolumeChangeDispatcher avc); - @EnforcePermission("MODIFY_AUDIO_SETTINGS_PRIVILEGED") oneway void unregisterAudioVolumeCallback(IAudioVolumeChangeDispatcher avc); int setUidDeviceAffinity(in IAudioPolicyCallback pcb, in int uid, in int[] deviceTypes, diff --git a/media/tests/AudioPolicyTest/AndroidManifest.xml b/media/tests/AudioPolicyTest/AndroidManifest.xml index 466da7e66fbf..5c911b135a5d 100644 --- a/media/tests/AudioPolicyTest/AndroidManifest.xml +++ b/media/tests/AudioPolicyTest/AndroidManifest.xml @@ -19,7 +19,6 @@ <uses-permission android:name="android.permission.RECORD_AUDIO" /> <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" /> - <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS_PRIVILEGED" /> <uses-permission android:name="android.permission.MODIFY_AUDIO_ROUTING" /> <uses-permission android:name="android.permission.CHANGE_ACCESSIBILITY_VOLUME" /> diff --git a/services/core/java/com/android/server/audio/AudioService.java b/services/core/java/com/android/server/audio/AudioService.java index a8bb5231d8c0..25fc1ff23561 100644 --- a/services/core/java/com/android/server/audio/AudioService.java +++ b/services/core/java/com/android/server/audio/AudioService.java @@ -4460,18 +4460,12 @@ public class AudioService extends IAudioService.Stub private final AudioVolumeChangeHandler mAudioVolumeChangeHandler; /** @see AudioManager#registerVolumeGroupCallback(executor, callback) */ - @android.annotation.EnforcePermission( - android.Manifest.permission.MODIFY_AUDIO_SETTINGS_PRIVILEGED) public void registerAudioVolumeCallback(IAudioVolumeChangeDispatcher callback) { - super.registerAudioVolumeCallback_enforcePermission(); mAudioVolumeChangeHandler.registerListener(callback); } /** @see AudioManager#unregisterVolumeGroupCallback(callback) */ - @android.annotation.EnforcePermission( - android.Manifest.permission.MODIFY_AUDIO_SETTINGS_PRIVILEGED) public void unregisterAudioVolumeCallback(IAudioVolumeChangeDispatcher callback) { - super.unregisterAudioVolumeCallback_enforcePermission(); mAudioVolumeChangeHandler.unregisterListener(callback); } |