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

Commit c455782e authored by Jean-Michel Trivi's avatar Jean-Michel Trivi
Browse files

AudioService: device vol behavior can use additional permission 

Let the device volume behavior APIs also accept the
system MODIFY_AUDIO_SYSTEM_SETTINGS permission, as
MODIFY_AUDIO_ROUTING alone is too strong a permission
to expect to use this feature.

import Manifest class.

Bug: 265774737
Test: atest AudioServiceHostTest#testAudioVolumeBehavior
Change-Id: Ia3ea9b3a4e24bdcc64240875a7d1db33bc1b469b
parent e4241197

core/api/system-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -6669,7 +6669,7 @@ package android.media { 
    method @NonNull @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public static java.util.List<android.media.audiopolicy.AudioVolumeGroup> getAudioVolumeGroups();

    method @NonNull @RequiresPermission(android.Manifest.permission.CALL_AUDIO_INTERCEPTION) public android.media.AudioRecord getCallDownlinkExtractionAudioRecord(@NonNull android.media.AudioFormat);

    method @NonNull @RequiresPermission(android.Manifest.permission.CALL_AUDIO_INTERCEPTION) public android.media.AudioTrack getCallUplinkInjectionAudioTrack(@NonNull android.media.AudioFormat);

    method @RequiresPermission(anyOf={android.Manifest.permission.MODIFY_AUDIO_ROUTING, "android.permission.QUERY_AUDIO_STATE"}) public int getDeviceVolumeBehavior(@NonNull android.media.AudioDeviceAttributes);

    method @RequiresPermission(anyOf={android.Manifest.permission.MODIFY_AUDIO_ROUTING, "android.permission.QUERY_AUDIO_STATE", android.Manifest.permission.MODIFY_AUDIO_SYSTEM_SETTINGS}) public int getDeviceVolumeBehavior(@NonNull android.media.AudioDeviceAttributes);

    method @NonNull @RequiresPermission(anyOf={android.Manifest.permission.MODIFY_AUDIO_ROUTING, "android.permission.QUERY_AUDIO_STATE"}) public java.util.List<android.media.AudioDeviceAttributes> getDevicesForAttributes(@NonNull android.media.AudioAttributes);

    method @RequiresPermission("android.permission.QUERY_AUDIO_STATE") public int getLastAudibleStreamVolume(int);

    method @IntRange(from=0) public long getMaxAdditionalOutputDeviceDelay(@NonNull android.media.AudioDeviceInfo);
@@ -6708,7 +6708,7 @@ package android.media { 
    method public void setAudioServerStateCallback(@NonNull java.util.concurrent.Executor, @NonNull android.media.AudioManager.AudioServerStateCallback);

    method @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public void setBluetoothVariableLatencyEnabled(boolean);

    method @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public boolean setDeviceAsNonDefaultForStrategy(@NonNull android.media.audiopolicy.AudioProductStrategy, @NonNull android.media.AudioDeviceAttributes);

    method @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public void setDeviceVolumeBehavior(@NonNull android.media.AudioDeviceAttributes, int);

    method @RequiresPermission(anyOf={android.Manifest.permission.MODIFY_AUDIO_ROUTING, android.Manifest.permission.MODIFY_AUDIO_SYSTEM_SETTINGS}) public void setDeviceVolumeBehavior(@NonNull android.media.AudioDeviceAttributes, int);

    method @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public void setFocusRequestResult(@NonNull android.media.AudioFocusInfo, int, @NonNull android.media.audiopolicy.AudioPolicy);

    method @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public boolean setPreferredDeviceForCapturePreset(int, @NonNull android.media.AudioDeviceAttributes);

    method @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public boolean setPreferredDeviceForStrategy(@NonNull android.media.audiopolicy.AudioProductStrategy, @NonNull android.media.AudioDeviceAttributes);

core/api/test-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -1644,7 +1644,7 @@ package android.media { 
    method @NonNull public java.util.Map<java.lang.Integer,java.lang.Boolean> getSurroundFormats();

    method public boolean hasRegisteredDynamicPolicy();

    method @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_SYSTEM_SETTINGS) public boolean isCsdEnabled();

    method @RequiresPermission(anyOf={android.Manifest.permission.MODIFY_AUDIO_ROUTING, android.Manifest.permission.QUERY_AUDIO_STATE}) public boolean isFullVolumeDevice();

    method @RequiresPermission(anyOf={android.Manifest.permission.MODIFY_AUDIO_ROUTING, android.Manifest.permission.QUERY_AUDIO_STATE, android.Manifest.permission.MODIFY_AUDIO_SYSTEM_SETTINGS}) public boolean isFullVolumeDevice();

    method @RequiresPermission(android.Manifest.permission.CALL_AUDIO_INTERCEPTION) public boolean isPstnCallAudioInterceptable();

    method @RequiresPermission("android.permission.QUERY_AUDIO_STATE") public int requestAudioFocusForTest(@NonNull android.media.AudioFocusRequest, @NonNull String, int, int);

    method @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_SYSTEM_SETTINGS) public void setCsd(float);

media/java/android/media/AudioManager.java

+102 −96

File changed.

Preview size limit exceeded, changes collapsed.

media/java/android/media/IAudioService.aidl

+2 −1
Original line number Diff line number Diff line
@@ -405,10 +405,11 @@ interface IAudioService { 


    oneway void setRttEnabled(in boolean rttEnabled);



    @EnforcePermission("MODIFY_AUDIO_ROUTING")

    @EnforcePermission(anyOf = {"MODIFY_AUDIO_ROUTING", "MODIFY_AUDIO_SYSTEM_SETTINGS"})

    void setDeviceVolumeBehavior(in AudioDeviceAttributes device,

             in int deviceVolumeBehavior, in String pkgName);



    @EnforcePermission(anyOf = {"MODIFY_AUDIO_ROUTING", "QUERY_AUDIO_STATE", "MODIFY_AUDIO_SYSTEM_SETTINGS"})

    int getDeviceVolumeBehavior(in AudioDeviceAttributes device);



    // WARNING: read warning at top of file, new methods that need to be used by native

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

+9 −5
Original line number Diff line number Diff line
@@ -7006,20 +7006,21 @@ public class AudioService extends IAudioService.Stub 
        }

    }













    @android.annotation.EnforcePermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING)















    /**















     * @see AudioManager#setDeviceVolumeBehavior(AudioDeviceAttributes, int)















     * @param device the audio device to be affected















     * @param deviceVolumeBehavior one of the device behaviors















     */













    @android.annotation.EnforcePermission(anyOf =













            {"MODIFY_AUDIO_ROUTING", "MODIFY_AUDIO_SYSTEM_SETTINGS"})















    public void setDeviceVolumeBehavior(@NonNull AudioDeviceAttributes device,















            @AudioManager.DeviceVolumeBehavior int deviceVolumeBehavior, @Nullable String pkgName) {















        // verify permissions













        // verify arguments















        super.setDeviceVolumeBehavior_enforcePermission();

























        // verify arguments















        Objects.requireNonNull(device);















        AudioManager.enforceValidVolumeBehavior(deviceVolumeBehavior);



























        sVolumeLogger.enqueue(new EventLogger.StringEvent("setDeviceVolumeBehavior: dev:"















                + AudioSystem.getOutputDeviceName(device.getInternalType()) + " addr:"















                + device.getAddress() + " behavior:"










@@ -7090,11 +7091,14 @@ public class AudioService extends IAudioService.Stub













     * @param device the audio output device type















     * @return the volume behavior for the device















     */













    @android.annotation.EnforcePermission(anyOf =













            {"MODIFY_AUDIO_ROUTING", "QUERY_AUDIO_STATE", "MODIFY_AUDIO_SYSTEM_SETTINGS"})















    public @AudioManager.DeviceVolumeBehavior















    int getDeviceVolumeBehavior(@NonNull AudioDeviceAttributes device) {













        Objects.requireNonNull(device);















        // verify permissions













        enforceQueryStateOrModifyRoutingPermission();













        super.getDeviceVolumeBehavior_enforcePermission();













        // verify parameters













        Objects.requireNonNull(device);





























        return getDeviceVolumeBehaviorInt(device);















    }