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

Commit 883022a2 authored by Vlad Popa's avatar Vlad Popa
Browse files

Mark SysApi methods in AudioDeviceVolumeManager 

The methods marked SysApi are necessary to implement the logic for
absolute volume management.

Test: atest AudioDeviceVolumeManagerTest
Bug: 396216663
Bug: 393657380
Flag: android.media.audio.unify_absolute_volume_management
Change-Id: I54bf93e23efe4b9653f68ecb3b5f08c1f2e75366
parent d967fee1

core/api/module-lib-current.txt

+10 −0
Original line number Diff line number Diff line
@@ -165,6 +165,16 @@ package android.hardware.usb { 


package android.media {



  public class AudioDeviceVolumeManager {

    method @FlaggedApi("android.media.audio.unify_absolute_volume_management") @RequiresPermission(anyOf={android.Manifest.permission.MODIFY_AUDIO_ROUTING, android.Manifest.permission.MODIFY_AUDIO_SETTINGS_PRIVILEGED, android.Manifest.permission.BLUETOOTH_PRIVILEGED, android.Manifest.permission.BLUETOOTH_STACK}) public void setDeviceAbsoluteMultiVolumeBehavior(@NonNull android.media.AudioDeviceAttributes, @NonNull java.util.List<android.media.VolumeInfo>, @NonNull java.util.concurrent.Executor, @NonNull android.media.AudioDeviceVolumeManager.OnAudioDeviceVolumeChangedListener);

    method @FlaggedApi("android.media.audio.unify_absolute_volume_management") @RequiresPermission(anyOf={android.Manifest.permission.MODIFY_AUDIO_ROUTING, android.Manifest.permission.MODIFY_AUDIO_SETTINGS_PRIVILEGED, android.Manifest.permission.BLUETOOTH_PRIVILEGED, android.Manifest.permission.BLUETOOTH_STACK}) public void setDeviceAbsoluteVolumeBehavior(@NonNull android.media.AudioDeviceAttributes, @NonNull android.media.VolumeInfo, @NonNull java.util.concurrent.Executor, @NonNull android.media.AudioDeviceVolumeManager.OnAudioDeviceVolumeChangedListener);

  }



  @FlaggedApi("android.media.audio.unify_absolute_volume_management") public static interface AudioDeviceVolumeManager.OnAudioDeviceVolumeChangedListener {

    method public void onAudioDeviceVolumeAdjusted(@NonNull android.media.AudioDeviceAttributes, @NonNull android.media.VolumeInfo, int, int);

    method public void onAudioDeviceVolumeChanged(@NonNull android.media.AudioDeviceAttributes, @NonNull android.media.VolumeInfo);

  }



  public class AudioManager {

    method public void adjustStreamVolumeForUid(int, int, int, @NonNull String, int, int, int);

    method public void adjustSuggestedStreamVolumeForUid(int, int, int, @NonNull String, int, int, int);

media/java/android/media/AudioDeviceVolumeManager.java

+55 −2
Original line number Diff line number Diff line
@@ -16,6 +16,9 @@ 


package android.media;



import static android.annotation.SystemApi.Client.MODULE_LIBRARIES;

import static android.media.audio.Flags.FLAG_UNIFY_ABSOLUTE_VOLUME_MANAGEMENT;



import static com.android.media.flags.Flags.FLAG_ENABLE_AUDIO_INPUT_DEVICE_ROUTING_AND_VOLUME_CONTROL;



import android.Manifest;
@@ -91,6 +94,8 @@ public class AudioDeviceVolumeManager { 
     * @see #setDeviceAbsoluteVolumeBehavior(AudioDeviceAttributes, VolumeInfo, boolean, Executor,

     *          OnAudioDeviceVolumeChangedListener)

     */

    @SystemApi(client = MODULE_LIBRARIES)

    @FlaggedApi(FLAG_UNIFY_ABSOLUTE_VOLUME_MANAGEMENT)

    public interface OnAudioDeviceVolumeChangedListener {

        /**

         * Called the device for the given audio device has changed.
@@ -197,6 +202,30 @@ public class AudioDeviceVolumeManager { 
        }

    }



    /**

     * @hide

     * Configures a device to use absolute volume model, and registers a listener for receiving

     * volume updates to apply on that device

     * @param device the audio device set to absolute volume mode

     * @param volume the type of volume this device responds to

     * @param executor the Executor used for receiving volume updates through the listener

     * @param vclistener the callback for volume updates

     */

    @SystemApi(client = MODULE_LIBRARIES)

    @RequiresPermission(anyOf = { android.Manifest.permission.MODIFY_AUDIO_ROUTING,

            android.Manifest.permission.MODIFY_AUDIO_SETTINGS_PRIVILEGED,

            android.Manifest.permission.BLUETOOTH_PRIVILEGED,

            android.Manifest.permission.BLUETOOTH_STACK})

    @FlaggedApi(FLAG_UNIFY_ABSOLUTE_VOLUME_MANAGEMENT)

    public void setDeviceAbsoluteVolumeBehavior(

            @NonNull AudioDeviceAttributes device,

            @NonNull VolumeInfo volume,

            @NonNull @CallbackExecutor Executor executor,

            @NonNull OnAudioDeviceVolumeChangedListener vclistener) {

        setDeviceAbsoluteVolumeBehavior(device, volume, /*handlesVolumeAdjustment=*/false, executor,

                vclistener);

    }



    /**

     * @hide

     * Configures a device to use absolute volume model, and registers a listener for receiving
@@ -223,6 +252,30 @@ public class AudioDeviceVolumeManager { 
                vclistener);

    }



    /**

     * @hide

     * Configures a device to use absolute volume model applied to different volume types, and

     * registers a listener for receiving volume updates to apply on that device

     * @param device the audio device set to absolute multi-volume mode

     * @param volumes the list of volumes the given device responds to

     * @param executor the Executor used for receiving volume updates through the listener

     * @param vclistener the callback for volume updates

     */

    @SystemApi(client = MODULE_LIBRARIES)

    @RequiresPermission(anyOf = { android.Manifest.permission.MODIFY_AUDIO_ROUTING,

            android.Manifest.permission.MODIFY_AUDIO_SETTINGS_PRIVILEGED,

            android.Manifest.permission.BLUETOOTH_PRIVILEGED,

            android.Manifest.permission.BLUETOOTH_STACK})

    @FlaggedApi(FLAG_UNIFY_ABSOLUTE_VOLUME_MANAGEMENT)

    public void setDeviceAbsoluteMultiVolumeBehavior(

            @NonNull AudioDeviceAttributes device,

            @NonNull List<VolumeInfo> volumes,

            @NonNull @CallbackExecutor Executor executor,

            @NonNull OnAudioDeviceVolumeChangedListener vclistener) {

        setDeviceAbsoluteMultiVolumeBehavior(device, volumes, /*handlesVolumeAdjustment=*/false,

                executor, vclistener);

    }



    /**

     * @hide

     * Configures a device to use absolute volume model applied to different volume types, and