Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d7a5466d authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Revert "Add MODIFY_AUDIO_SETTINGS_PRIVILEGED permission check to volume callback"" into main

parents 6b2acac6 b1ca8f99

media/java/android/media/IAudioService.aidl

+0 −2
Original line number Diff line number Diff line
@@ -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,

media/tests/AudioPolicyTest/AndroidManifest.xml

+0 −1
Original line number Diff line number Diff line
@@ -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" />

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

+0 −6
Original line number Diff line number Diff line
@@ -4466,18 +4466,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);















    }