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

Commit 8019ae84 authored by Vlad Popa's avatar Vlad Popa
Browse files

Move the volume behavior APIs to AudioDeviceVolumeManager 

Test: atest AudioDeviceVolumeBehaviorCompatTest, AudioVolumeBehaviorTest
Flag: android.media.audio.unify_absolute_volume_management
Bug: 393657380
Change-Id: Icf8d07d4fdf616f4cff6c223f5538001d364ebfc
parent 68f764be

core/api/system-current.txt

+16 −8
Original line number Diff line number Diff line
@@ -7336,7 +7336,15 @@ package android.media { 














  public class AudioDeviceVolumeManager {















    method @NonNull @RequiresPermission(anyOf={android.Manifest.permission.MODIFY_AUDIO_ROUTING, android.Manifest.permission.MODIFY_AUDIO_SETTINGS_PRIVILEGED}) public android.media.VolumeInfo getDeviceVolume(@NonNull android.media.VolumeInfo, @NonNull android.media.AudioDeviceAttributes);













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















    method @RequiresPermission(anyOf={android.Manifest.permission.MODIFY_AUDIO_ROUTING, android.Manifest.permission.MODIFY_AUDIO_SETTINGS_PRIVILEGED}) public void setDeviceVolume(@NonNull android.media.VolumeInfo, @NonNull android.media.AudioDeviceAttributes);













    method @FlaggedApi("android.media.audio.unify_absolute_volume_management") @RequiresPermission(anyOf={android.Manifest.permission.MODIFY_AUDIO_ROUTING, android.Manifest.permission.MODIFY_AUDIO_SETTINGS_PRIVILEGED}) public void setDeviceVolumeBehavior(@NonNull android.media.AudioDeviceAttributes, int);













    field @FlaggedApi("android.media.audio.unify_absolute_volume_management") public static final int DEVICE_VOLUME_BEHAVIOR_ABSOLUTE = 3; // 0x3













    field @FlaggedApi("android.media.audio.unify_absolute_volume_management") public static final int DEVICE_VOLUME_BEHAVIOR_ABSOLUTE_ADJUST_ONLY = 5; // 0x5













    field @FlaggedApi("android.media.audio.unify_absolute_volume_management") public static final int DEVICE_VOLUME_BEHAVIOR_ABSOLUTE_MULTI_MODE = 4; // 0x4













    field @FlaggedApi("android.media.audio.unify_absolute_volume_management") public static final int DEVICE_VOLUME_BEHAVIOR_FIXED = 2; // 0x2













    field @FlaggedApi("android.media.audio.unify_absolute_volume_management") public static final int DEVICE_VOLUME_BEHAVIOR_FULL = 1; // 0x1













    field @FlaggedApi("android.media.audio.unify_absolute_volume_management") public static final int DEVICE_VOLUME_BEHAVIOR_VARIABLE = 0; // 0x0















  }





























  public final class AudioFocusInfo implements android.os.Parcelable {










@@ -7381,7 +7389,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", android.Manifest.permission.MODIFY_AUDIO_SETTINGS_PRIVILEGED}) public int getDeviceVolumeBehavior(@NonNull android.media.AudioDeviceAttributes);













    method @Deprecated @FlaggedApi("android.media.audio.unify_absolute_volume_management") @RequiresPermission(anyOf={android.Manifest.permission.MODIFY_AUDIO_ROUTING, "android.permission.QUERY_AUDIO_STATE", android.Manifest.permission.MODIFY_AUDIO_SETTINGS_PRIVILEGED}) 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 @NonNull @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_SETTINGS_PRIVILEGED) public java.util.List<java.lang.Integer> getIndependentStreamTypes();















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










@@ -7427,7 +7435,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(anyOf={android.Manifest.permission.MODIFY_AUDIO_ROUTING, android.Manifest.permission.MODIFY_AUDIO_SETTINGS_PRIVILEGED}) public void setDeviceVolumeBehavior(@NonNull android.media.AudioDeviceAttributes, int);













    method @Deprecated @FlaggedApi("android.media.audio.unify_absolute_volume_management") @RequiresPermission(anyOf={android.Manifest.permission.MODIFY_AUDIO_ROUTING, android.Manifest.permission.MODIFY_AUDIO_SETTINGS_PRIVILEGED}) 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);









@@ -7447,12 +7455,12 @@ package android.media {













    field public static final int AUDIOFOCUS_FLAG_PAUSES_ON_DUCKABLE_LOSS = 2; // 0x2















    field @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public static final int DEVICE_CONNECTION_STATE_CONNECTED = 1; // 0x1















    field @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public static final int DEVICE_CONNECTION_STATE_DISCONNECTED = 0; // 0x0













    field public static final int DEVICE_VOLUME_BEHAVIOR_ABSOLUTE = 3; // 0x3













    field public static final int DEVICE_VOLUME_BEHAVIOR_ABSOLUTE_ADJUST_ONLY = 5; // 0x5













    field public static final int DEVICE_VOLUME_BEHAVIOR_ABSOLUTE_MULTI_MODE = 4; // 0x4













    field public static final int DEVICE_VOLUME_BEHAVIOR_FIXED = 2; // 0x2













    field public static final int DEVICE_VOLUME_BEHAVIOR_FULL = 1; // 0x1













    field public static final int DEVICE_VOLUME_BEHAVIOR_VARIABLE = 0; // 0x0













    field @Deprecated @FlaggedApi("android.media.audio.unify_absolute_volume_management") public static final int DEVICE_VOLUME_BEHAVIOR_ABSOLUTE = 3; // 0x3













    field @Deprecated @FlaggedApi("android.media.audio.unify_absolute_volume_management") public static final int DEVICE_VOLUME_BEHAVIOR_ABSOLUTE_ADJUST_ONLY = 5; // 0x5













    field @Deprecated @FlaggedApi("android.media.audio.unify_absolute_volume_management") public static final int DEVICE_VOLUME_BEHAVIOR_ABSOLUTE_MULTI_MODE = 4; // 0x4













    field @Deprecated @FlaggedApi("android.media.audio.unify_absolute_volume_management") public static final int DEVICE_VOLUME_BEHAVIOR_FIXED = 2; // 0x2













    field @Deprecated @FlaggedApi("android.media.audio.unify_absolute_volume_management") public static final int DEVICE_VOLUME_BEHAVIOR_FULL = 1; // 0x1













    field @Deprecated @FlaggedApi("android.media.audio.unify_absolute_volume_management") public static final int DEVICE_VOLUME_BEHAVIOR_VARIABLE = 0; // 0x0















    field public static final String EXTRA_VOLUME_STREAM_TYPE = "android.media.EXTRA_VOLUME_STREAM_TYPE";















    field public static final String EXTRA_VOLUME_STREAM_VALUE = "android.media.EXTRA_VOLUME_STREAM_VALUE";















    field public static final int FLAG_BLUETOOTH_ABS_VOLUME = 64; // 0x40

























core/api/test-current.txt



+4
−1




























Original line number
Diff line number
Diff line








@@ -1955,6 +1955,10 @@ package android.media {













    method public static void enforceValidAudioDeviceTypeOut(int);















  }





























  public class AudioDeviceVolumeManager {













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













  }





























  public final class AudioFocusRequest {















    method @Nullable public android.media.AudioManager.OnAudioFocusChangeListener getOnAudioFocusChangeListener();















  }










@@ -2010,7 +2014,6 @@ package android.media {













    method @NonNull public android.media.VolumePolicy getVolumePolicy();















    method public boolean hasRegisteredDynamicPolicy();















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













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















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















    method @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_SETTINGS_PRIVILEGED) public boolean isVolumeControlUsingVolumeGroups();















    method public void permissionUpdateBarrier();

































media/java/android/media/AudioDeviceVolumeManager.java



+224
−14




























Original line number
Diff line number
Diff line








@@ -29,6 +29,7 @@ import android.annotation.NonNull;













import android.annotation.Nullable;















import android.annotation.RequiresPermission;















import android.annotation.SystemApi;













import android.annotation.TestApi;















import android.content.Context;















import android.os.IBinder;















import android.os.RemoteException;









@@ -52,6 +53,127 @@ public class AudioDeviceVolumeManager {





























    private static final String TAG = "AudioDeviceVolumeManager";





























    /**













     * @hide













     * Volume behavior for an audio device that has no particular volume behavior set. Invalid as













     * an argument to {@link #setDeviceVolumeBehavior(AudioDeviceAttributes, int)} and should not













     * be returned by {@link #getDeviceVolumeBehavior(AudioDeviceAttributes)}.













     */













    public static final int DEVICE_VOLUME_BEHAVIOR_UNSET = -1;













    /**













     * @hide













     * Volume behavior for an audio device where a software attenuation is applied













     * @see #setDeviceVolumeBehavior(AudioDeviceAttributes, int)













     */













    @SystemApi













    @FlaggedApi(FLAG_UNIFY_ABSOLUTE_VOLUME_MANAGEMENT)













    public static final int DEVICE_VOLUME_BEHAVIOR_VARIABLE = 0;













    /**













     * @hide













     * Volume behavior for an audio device where the volume is always set to provide no attenuation













     *     nor gain (e.g. unit gain).













     * @see #setDeviceVolumeBehavior(AudioDeviceAttributes, int)













     */













    @SystemApi













    @FlaggedApi(FLAG_UNIFY_ABSOLUTE_VOLUME_MANAGEMENT)













    public static final int DEVICE_VOLUME_BEHAVIOR_FULL = 1;













    /**













     * @hide













     * Volume behavior for an audio device where the volume is either set to muted, or to provide













     *     no attenuation nor gain (e.g. unit gain).













     * @see #setDeviceVolumeBehavior(AudioDeviceAttributes, int)













     */













    @SystemApi













    @FlaggedApi(FLAG_UNIFY_ABSOLUTE_VOLUME_MANAGEMENT)













    public static final int DEVICE_VOLUME_BEHAVIOR_FIXED = 2;













    /**













     * @hide













     * Volume behavior for an audio device where no software attenuation is applied, and













     *     the volume is kept synchronized between the host and the device itself through a













     *     device-specific protocol such as BT AVRCP.













     * @see #setDeviceVolumeBehavior(AudioDeviceAttributes, int)













     */













    @SystemApi













    @FlaggedApi(FLAG_UNIFY_ABSOLUTE_VOLUME_MANAGEMENT)













    public static final int DEVICE_VOLUME_BEHAVIOR_ABSOLUTE = 3;













    /**













     * @hide













     * Volume behavior for an audio device where no software attenuation is applied, and













     *     the volume is kept synchronized between the host and the device itself through a













     *     device-specific protocol (such as for hearing aids), based on the audio mode (e.g.













     *     normal vs in phone call).













     * @see AudioManager#setMode(int)













     * @see #setDeviceVolumeBehavior(AudioDeviceAttributes, int)













     */













    @SystemApi













    @FlaggedApi(FLAG_UNIFY_ABSOLUTE_VOLUME_MANAGEMENT)













    public static final int DEVICE_VOLUME_BEHAVIOR_ABSOLUTE_MULTI_MODE = 4;



























    /**













     * @hide













     * A variant of {@link #DEVICE_VOLUME_BEHAVIOR_ABSOLUTE} where the host cannot reliably set













     * the volume percentage of the audio device. Specifically, {@link AudioManager#setStreamVolume}













     * will have no effect, or an unreliable effect.













     */













    @SystemApi













    @FlaggedApi(FLAG_UNIFY_ABSOLUTE_VOLUME_MANAGEMENT)













    public static final int DEVICE_VOLUME_BEHAVIOR_ABSOLUTE_ADJUST_ONLY = 5;



























    /** @hide */













    @IntDef({













            DEVICE_VOLUME_BEHAVIOR_VARIABLE,













            DEVICE_VOLUME_BEHAVIOR_FULL,













            DEVICE_VOLUME_BEHAVIOR_FIXED,













            DEVICE_VOLUME_BEHAVIOR_ABSOLUTE,













            DEVICE_VOLUME_BEHAVIOR_ABSOLUTE_MULTI_MODE,













            DEVICE_VOLUME_BEHAVIOR_ABSOLUTE_ADJUST_ONLY,













    })













    @Retention(RetentionPolicy.SOURCE)













    public @interface DeviceVolumeBehavior {}



























    /** @hide */













    @IntDef({













            DEVICE_VOLUME_BEHAVIOR_UNSET,













            DEVICE_VOLUME_BEHAVIOR_VARIABLE,













            DEVICE_VOLUME_BEHAVIOR_FULL,













            DEVICE_VOLUME_BEHAVIOR_FIXED,













            DEVICE_VOLUME_BEHAVIOR_ABSOLUTE,













            DEVICE_VOLUME_BEHAVIOR_ABSOLUTE_MULTI_MODE,













            DEVICE_VOLUME_BEHAVIOR_ABSOLUTE_ADJUST_ONLY,













    })













    @Retention(RetentionPolicy.SOURCE)













    public @interface DeviceVolumeBehaviorState {}



























    /**













     * Variants of absolute volume behavior that are set in for absolute volume management.













     * @hide













     */













    @IntDef({













            DEVICE_VOLUME_BEHAVIOR_ABSOLUTE,













            DEVICE_VOLUME_BEHAVIOR_ABSOLUTE_ADJUST_ONLY,













    })













    @Retention(RetentionPolicy.SOURCE)













    public @interface AbsoluteDeviceVolumeBehavior {}



























    /**













     * @hide













     * Throws IAE on an invalid volume behavior value













     * @param volumeBehavior behavior value to check













     */













    public static void enforceValidVolumeBehavior(int volumeBehavior) {













        switch (volumeBehavior) {













            case DEVICE_VOLUME_BEHAVIOR_VARIABLE:













            case DEVICE_VOLUME_BEHAVIOR_FULL:













            case DEVICE_VOLUME_BEHAVIOR_FIXED:













            case DEVICE_VOLUME_BEHAVIOR_ABSOLUTE:













            case DEVICE_VOLUME_BEHAVIOR_ABSOLUTE_MULTI_MODE:













            case DEVICE_VOLUME_BEHAVIOR_ABSOLUTE_ADJUST_ONLY:













                return;













            default:













                throw new IllegalArgumentException("Illegal volume behavior " + volumeBehavior);













        }













    }





























    /** @hide















     * Indicates no special treatment in the handling of the volume adjustment */















    public static final int ADJUST_MODE_NORMAL = 0;










@@ -158,7 +280,7 @@ public class AudioDeviceVolumeManager {













                android.Manifest.permission.BLUETOOTH_PRIVILEGED })















        public void register(boolean register, @NonNull AudioDeviceAttributes device,















                @NonNull List<VolumeInfo> volumes, boolean handlesVolumeAdjustment,













                @AudioManager.AbsoluteDeviceVolumeBehavior int behavior) {













                @AbsoluteDeviceVolumeBehavior int behavior) {















            try {















                getService().registerDeviceVolumeDispatcherForAbsoluteVolume(register,















                        this, mPackageName,










@@ -202,6 +324,94 @@ public class AudioDeviceVolumeManager {













        }















    }





























    /**













     * @hide













     * Sets the volume behavior for an audio output device.













     * @see #DEVICE_VOLUME_BEHAVIOR_VARIABLE













     * @see #DEVICE_VOLUME_BEHAVIOR_FULL













     * @see #DEVICE_VOLUME_BEHAVIOR_FIXED













     * @see #DEVICE_VOLUME_BEHAVIOR_ABSOLUTE













     * @see #DEVICE_VOLUME_BEHAVIOR_ABSOLUTE_MULTI_MODE













     * @param device the device to be affected













     * @param deviceVolumeBehavior one of the device behaviors













     */













    @SystemApi













    @RequiresPermission(anyOf = {













            Manifest.permission.MODIFY_AUDIO_ROUTING,













            Manifest.permission.MODIFY_AUDIO_SETTINGS_PRIVILEGED













    })













    @FlaggedApi(FLAG_UNIFY_ABSOLUTE_VOLUME_MANAGEMENT)













    public void setDeviceVolumeBehavior(@NonNull AudioDeviceAttributes device,













            @DeviceVolumeBehavior int deviceVolumeBehavior) {













        // verify arguments (validity of device type is enforced in server)













        Objects.requireNonNull(device);













        enforceValidVolumeBehavior(deviceVolumeBehavior);













        // communicate with service













        final IAudioService service = getService();













        try {













            service.setDeviceVolumeBehavior(device, deviceVolumeBehavior, mPackageName);













        } catch (RemoteException e) {













            throw e.rethrowFromSystemServer();













        }













    }



























    /**













     * @hide













     * Returns the volume device behavior for the given audio device













     * @param device the audio device













     * @return the volume behavior for the device













     */













    @SystemApi













    @RequiresPermission(anyOf = {













            Manifest.permission.MODIFY_AUDIO_ROUTING,













            Manifest.permission.QUERY_AUDIO_STATE,













            Manifest.permission.MODIFY_AUDIO_SETTINGS_PRIVILEGED













    })













    @FlaggedApi(FLAG_UNIFY_ABSOLUTE_VOLUME_MANAGEMENT)













    public @DeviceVolumeBehavior int getDeviceVolumeBehavior(













            @NonNull AudioDeviceAttributes device) {













        // verify arguments (validity of device type is enforced in server)













        Objects.requireNonNull(device);













        // communicate with service













        final IAudioService service = getService();













        try {













            return service.getDeviceVolumeBehavior(device);













        } catch (RemoteException e) {













            throw e.rethrowFromSystemServer();













        }













    }



























    /**













     * @hide













     * Returns {@code true} if the volume device behavior is {@link #DEVICE_VOLUME_BEHAVIOR_FULL}.













     */













    @TestApi













    @RequiresPermission(anyOf = {













            Manifest.permission.MODIFY_AUDIO_ROUTING,













            Manifest.permission.QUERY_AUDIO_STATE,













            Manifest.permission.MODIFY_AUDIO_SETTINGS_PRIVILEGED













    })













    @SuppressWarnings("UnflaggedApi")  // @TestApi without associated feature.













    public boolean isFullVolumeDevice() {













        final AudioAttributes attributes = new AudioAttributes.Builder()













                .setUsage(AudioAttributes.USAGE_MEDIA)













                .build();













        List<AudioDeviceAttributes> devices;













        final IAudioService service = getService();













        try {













            devices = service.getDevicesForAttributes(attributes);













        } catch (RemoteException e) {













            throw e.rethrowFromSystemServer();













        }



























        for (AudioDeviceAttributes device : devices) {













            if (getDeviceVolumeBehavior(device) == DEVICE_VOLUME_BEHAVIOR_FULL) {













                return true;













            }













        }













        return false;













    }





























    /**















     * @hide















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










@@ -297,7 +507,7 @@ public class AudioDeviceVolumeManager {













            @NonNull @CallbackExecutor Executor executor,















            @NonNull OnAudioDeviceVolumeChangedListener vclistener) {















        baseSetDeviceAbsoluteMultiVolumeBehavior(device, volumes, executor, vclistener,













                handlesVolumeAdjustment, AudioManager.DEVICE_VOLUME_BEHAVIOR_ABSOLUTE);













                handlesVolumeAdjustment, DEVICE_VOLUME_BEHAVIOR_ABSOLUTE);















    }































    /**










@@ -355,12 +565,12 @@ public class AudioDeviceVolumeManager {













            @NonNull @CallbackExecutor Executor executor,















            @NonNull OnAudioDeviceVolumeChangedListener vclistener) {















        baseSetDeviceAbsoluteMultiVolumeBehavior(device, volumes, executor, vclistener,













                handlesVolumeAdjustment, AudioManager.DEVICE_VOLUME_BEHAVIOR_ABSOLUTE_ADJUST_ONLY);













                handlesVolumeAdjustment, DEVICE_VOLUME_BEHAVIOR_ABSOLUTE_ADJUST_ONLY);















    }































    /**















     * Base method for configuring a device to use absolute volume behavior, or one of its variants.













     * See {@link AudioManager.AbsoluteDeviceVolumeBehavior} for a list of allowed behaviors.













     * See {@link AbsoluteDeviceVolumeBehavior} for a list of allowed behaviors.















     *















     * @param behavior the variant of absolute device volume behavior to adopt















     */









@@ -372,7 +582,7 @@ public class AudioDeviceVolumeManager {













            @NonNull @CallbackExecutor Executor executor,















            @NonNull OnAudioDeviceVolumeChangedListener vclistener,















            boolean handlesVolumeAdjustment,













            @AudioManager.AbsoluteDeviceVolumeBehavior int behavior) {













            @AbsoluteDeviceVolumeBehavior int behavior) {















        Objects.requireNonNull(device);















        Objects.requireNonNull(volumes);















        Objects.requireNonNull(executor);










@@ -417,7 +627,7 @@ public class AudioDeviceVolumeManager {













         */















        void onDeviceVolumeBehaviorChanged(















                @NonNull AudioDeviceAttributes device,













                @AudioManager.DeviceVolumeBehavior int volumeBehavior);













                @DeviceVolumeBehavior int volumeBehavior);















    }































    /**










@@ -580,19 +790,19 @@ public class AudioDeviceVolumeManager {













     * @param behavior one of the volume behaviors defined in AudioManager















     * @return a string for the given behavior















     */













    public static String volumeBehaviorName(@AudioManager.DeviceVolumeBehavior int behavior) {













    public static String volumeBehaviorName(@DeviceVolumeBehavior int behavior) {















        switch (behavior) {













            case AudioManager.DEVICE_VOLUME_BEHAVIOR_VARIABLE:













            case DEVICE_VOLUME_BEHAVIOR_VARIABLE:















                return "DEVICE_VOLUME_BEHAVIOR_VARIABLE";













            case AudioManager.DEVICE_VOLUME_BEHAVIOR_FULL:













            case DEVICE_VOLUME_BEHAVIOR_FULL:















                return "DEVICE_VOLUME_BEHAVIOR_FULL";













            case AudioManager.DEVICE_VOLUME_BEHAVIOR_FIXED:













            case DEVICE_VOLUME_BEHAVIOR_FIXED:















                return "DEVICE_VOLUME_BEHAVIOR_FIXED";













            case AudioManager.DEVICE_VOLUME_BEHAVIOR_ABSOLUTE:













            case DEVICE_VOLUME_BEHAVIOR_ABSOLUTE:















                return "DEVICE_VOLUME_BEHAVIOR_ABSOLUTE";













            case AudioManager.DEVICE_VOLUME_BEHAVIOR_ABSOLUTE_MULTI_MODE:













            case DEVICE_VOLUME_BEHAVIOR_ABSOLUTE_MULTI_MODE:















                return "DEVICE_VOLUME_BEHAVIOR_ABSOLUTE_MULTI_MODE";













            case AudioManager.DEVICE_VOLUME_BEHAVIOR_ABSOLUTE_ADJUST_ONLY:













            case DEVICE_VOLUME_BEHAVIOR_ABSOLUTE_ADJUST_ONLY:















                return "DEVICE_VOLUME_BEHAVIOR_ABSOLUTE_ADJUST_ONLY";















            default:















                return "invalid volume behavior " + behavior;









@@ -611,7 +821,7 @@ public class AudioDeviceVolumeManager {





























        @Override















        public void dispatchDeviceVolumeBehaviorChanged(@NonNull AudioDeviceAttributes device,













                @AudioManager.DeviceVolumeBehavior int volumeBehavior) {













                @DeviceVolumeBehavior int volumeBehavior) {















            mDeviceVolumeBehaviorChangedListenerMgr.callListeners((listener) ->















                    listener.onDeviceVolumeBehaviorChanged(device, volumeBehavior));















        }

































media/java/android/media/AudioManager.java



+23
−67


























File changed.
Preview size limit exceeded, changes collapsed.
























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



+16
−12


























File changed.
Preview size limit exceeded, changes collapsed.