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

Commit eb939bc3 authored by Eric Laurent's avatar Eric Laurent Committed by Android (Google) Code Review
Browse files

Merge changes from topic "volume_group_apis" 

* changes:
  [IMPR] AudioProductStrategy: add getName system hidden API
  fixup '[IMPR] AudioManager: add adjustAttributesVolume API'
  [IMPR] AudioService: improve bijectivity between VSS / VGS
  [BUG] AudioService: fix mute/umute of aliased streams.
  [IMPR] AudioManager: add adjustAttributesVolume API
parents 7ef77155 212af5e0

core/api/current.txt

+3 −0
Original line number Diff line number Diff line
@@ -20908,6 +20908,7 @@ package android.media { 
    method public void adjustStreamVolume(int, int, int);

    method public void adjustSuggestedStreamVolume(int, int, int);

    method public void adjustVolume(int, int);

    method public void adjustVolumeGroupVolume(int, int, int);

    method public void clearCommunicationDevice();

    method @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_SETTINGS) public boolean clearPreferredMixerAttributes(@NonNull android.media.AudioAttributes, @NonNull android.media.AudioDeviceInfo);

    method public void dispatchMediaKeyEvent(android.view.KeyEvent);
@@ -20938,6 +20939,7 @@ package android.media { 
    method public float getStreamVolumeDb(int, int, int);

    method @NonNull public java.util.List<android.media.AudioMixerAttributes> getSupportedMixerAttributes(@NonNull android.media.AudioDeviceInfo);

    method @Deprecated public int getVibrateSetting(int);

    method public int getVolumeGroupIdForAttributes(@NonNull android.media.AudioAttributes);

    method @Deprecated public boolean isBluetoothA2dpOn();

    method public boolean isBluetoothScoAvailableOffCall();

    method @Deprecated public boolean isBluetoothScoOn();
@@ -20951,6 +20953,7 @@ package android.media { 
    method public boolean isStreamMute(int);

    method public boolean isSurroundFormatEnabled(int);

    method public boolean isVolumeFixed();

    method public boolean isVolumeGroupMuted(int);

    method @Deprecated public boolean isWiredHeadsetOn();

    method public void loadSoundEffects();

    method public void playSoundEffect(int);

core/api/system-current.txt

+6 −0
Original line number Diff line number Diff line
@@ -6680,6 +6680,7 @@ package android.media { 
    method @RequiresPermission(anyOf={android.Manifest.permission.MODIFY_AUDIO_ROUTING, "android.permission.QUERY_AUDIO_STATE"}) 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) @RequiresPermission("android.permission.QUERY_AUDIO_STATE") public int getLastAudibleVolumeGroupVolume(int);

    method @IntRange(from=0) public long getMaxAdditionalOutputDeviceDelay(@NonNull android.media.AudioDeviceInfo);

    method @IntRange(from=0) @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public int getMaxVolumeIndexForAttributes(@NonNull android.media.AudioAttributes);

    method @IntRange(from=0) @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public int getMinVolumeIndexForAttributes(@NonNull android.media.AudioAttributes);
@@ -6689,6 +6690,9 @@ package android.media { 
    method @NonNull @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public java.util.List<android.media.AudioDeviceAttributes> getPreferredDevicesForCapturePreset(int);

    method @NonNull @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public java.util.List<android.media.AudioDeviceAttributes> getPreferredDevicesForStrategy(@NonNull android.media.audiopolicy.AudioProductStrategy);

    method @NonNull @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public int[] getSupportedSystemUsages();

    method @IntRange(from=0) @RequiresPermission(anyOf={android.Manifest.permission.MODIFY_AUDIO_SYSTEM_SETTINGS, android.Manifest.permission.MODIFY_AUDIO_ROUTING}) public int getVolumeGroupMaxVolumeIndex(int);

    method @IntRange(from=0) @RequiresPermission(anyOf={android.Manifest.permission.MODIFY_AUDIO_SYSTEM_SETTINGS, android.Manifest.permission.MODIFY_AUDIO_ROUTING}) public int getVolumeGroupMinVolumeIndex(int);

    method @IntRange(from=0) @RequiresPermission(anyOf={android.Manifest.permission.MODIFY_AUDIO_SYSTEM_SETTINGS, android.Manifest.permission.MODIFY_AUDIO_ROUTING}) public int getVolumeGroupVolumeIndex(int);

    method @IntRange(from=0) @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public int getVolumeIndexForAttributes(@NonNull android.media.AudioAttributes);

    method public boolean isAudioServerRunning();

    method @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public boolean isBluetoothVariableLatencyEnabled();
@@ -6722,6 +6726,7 @@ package android.media { 
    method @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public boolean setPreferredDeviceForStrategy(@NonNull android.media.audiopolicy.AudioProductStrategy, @NonNull android.media.AudioDeviceAttributes);

    method @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public boolean setPreferredDevicesForStrategy(@NonNull android.media.audiopolicy.AudioProductStrategy, @NonNull java.util.List<android.media.AudioDeviceAttributes>);

    method @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public void setSupportedSystemUsages(@NonNull int[]);

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

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

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

    method @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public void unregisterAudioPolicy(@NonNull android.media.audiopolicy.AudioPolicy);
@@ -7128,6 +7133,7 @@ package android.media.audiopolicy { 
    method public int describeContents();

    method @NonNull public android.media.AudioAttributes getAudioAttributes();

    method public int getId();

    method @NonNull public String getName();

    method public boolean supportsAudioAttributes(@NonNull android.media.AudioAttributes);

    method public void writeToParcel(@NonNull android.os.Parcel, int);

    field @NonNull public static final android.os.Parcelable.Creator<android.media.audiopolicy.AudioProductStrategy> CREATOR;

media/java/android/media/AudioManager.java

+181 −17
Original line number Diff line number Diff line
@@ -1350,12 +1350,8 @@ public class AudioManager { 
    public void setVolumeIndexForAttributes(@NonNull AudioAttributes attr, int index, int flags) {

        Preconditions.checkNotNull(attr, "attr must not be null");

        final IAudioService service = getService();

        try {

            service.setVolumeIndexForAttributes(attr, index, flags,

                    getContext().getOpPackageName(), getContext().getAttributionTag());

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

        int groupId = getVolumeGroupIdForAttributes(attr);

        setVolumeGroupVolumeIndex(groupId, index, flags);

    }



    /**
@@ -1374,11 +1370,8 @@ public class AudioManager { 
    public int getVolumeIndexForAttributes(@NonNull AudioAttributes attr) {

        Preconditions.checkNotNull(attr, "attr must not be null");

        final IAudioService service = getService();

        try {

            return service.getVolumeIndexForAttributes(attr);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

        int groupId = getVolumeGroupIdForAttributes(attr);

        return getVolumeGroupVolumeIndex(groupId);

    }



    /**
@@ -1395,11 +1388,8 @@ public class AudioManager { 
    public int getMaxVolumeIndexForAttributes(@NonNull AudioAttributes attr) {

        Preconditions.checkNotNull(attr, "attr must not be null");

        final IAudioService service = getService();

        try {

            return service.getMaxVolumeIndexForAttributes(attr);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

        int groupId = getVolumeGroupIdForAttributes(attr);

        return getVolumeGroupMaxVolumeIndex(groupId);

    }



    /**
@@ -1416,8 +1406,182 @@ public class AudioManager { 
    public int getMinVolumeIndexForAttributes(@NonNull AudioAttributes attr) {

        Preconditions.checkNotNull(attr, "attr must not be null");

        final IAudioService service = getService();

        int groupId = getVolumeGroupIdForAttributes(attr);

        return getVolumeGroupMinVolumeIndex(groupId);

    }



    /**

     * Returns the volume group id associated to the given {@link AudioAttributes}.

     *

     * @param attributes The {@link AudioAttributes} to consider.

     * @return {@link android.media.audiopolicy.AudioVolumeGroup} id supporting the given

     * {@link AudioAttributes} if found,

     * {@code android.media.audiopolicy.AudioVolumeGroup.DEFAULT_VOLUME_GROUP} otherwise.

     */

    public int getVolumeGroupIdForAttributes(@NonNull AudioAttributes attributes) {

        Preconditions.checkNotNull(attributes, "Audio Attributes must not be null");

        return AudioProductStrategy.getVolumeGroupIdForAudioAttributes(attributes,

                /* fallbackOnDefault= */ false);

    }



    /**

     * Sets the volume index for a particular group associated to given id.

     * <p> Call first in prior {@link #getVolumeGroupIdForAttributes(AudioAttributes)}

     * to retrieve the volume group id supporting the given {@link AudioAttributes}.

     *

     * @param groupId of the {@link android.media.audiopolicy.AudioVolumeGroup} to consider.

     * @param index The volume index to set. See

     *          {@link #getVolumeGroupMaxVolumeIndex(id)} for the largest valid value

     *          {@link #getVolumeGroupMinVolumeIndex(id)} for the lowest valid value.

     * @param flags One or more flags.

     * @hide

     */

    @SystemApi

    @RequiresPermission(anyOf = {

            android.Manifest.permission.MODIFY_AUDIO_SYSTEM_SETTINGS,

            android.Manifest.permission.MODIFY_AUDIO_ROUTING

    })

    public void setVolumeGroupVolumeIndex(int groupId, int index, int flags) {

        final IAudioService service = getService();

        try {

            service.setVolumeGroupVolumeIndex(groupId, index, flags,

                    getContext().getOpPackageName(), getContext().getAttributionTag());

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

    }



    /**

     * Returns the current volume index for a particular group associated to given id.

     * <p> Call first in prior {@link #getVolumeGroupIdForAttributes(AudioAttributes)}

     * to retrieve the volume group id supporting the given {@link AudioAttributes}.

     *

     * @param groupId of the {@link android.media.audiopolicy.AudioVolumeGroup} to consider.

     * @return The current volume index for the stream.

     * @hide

     */

    @SystemApi

    @IntRange(from = 0)

    @RequiresPermission(anyOf = {

            android.Manifest.permission.MODIFY_AUDIO_SYSTEM_SETTINGS,

            android.Manifest.permission.MODIFY_AUDIO_ROUTING

    })

    public int getVolumeGroupVolumeIndex(int groupId) {

        final IAudioService service = getService();

        try {

            return service.getVolumeGroupVolumeIndex(groupId);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

    }



    /**

     * Returns the maximum volume index for a particular group associated to given id.

     * <p> Call first in prior {@link #getVolumeGroupIdForAttributes(AudioAttributes)}

     * to retrieve the volume group id supporting the given {@link AudioAttributes}.

     *

     * @param groupId of the {@link android.media.audiopolicy.AudioVolumeGroup} to consider.

     * @return The maximum valid volume index for the {@link AudioAttributes}.

     * @hide

     */

    @SystemApi

    @IntRange(from = 0)

    @RequiresPermission(anyOf = {

            android.Manifest.permission.MODIFY_AUDIO_SYSTEM_SETTINGS,

            android.Manifest.permission.MODIFY_AUDIO_ROUTING

    })

    public int getVolumeGroupMaxVolumeIndex(int groupId) {

        final IAudioService service = getService();

        try {

            return service.getVolumeGroupMaxVolumeIndex(groupId);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

    }



    /**

     * Returns the minimum volume index for a particular group associated to given id.

     * <p> Call first in prior {@link #getVolumeGroupIdForAttributes(AudioAttributes)}

     * to retrieve the volume group id supporting the given {@link AudioAttributes}.

     *

     * @param groupId of the {@link android.media.audiopolicy.AudioVolumeGroup} to consider.

     * @return The minimum valid volume index for the {@link AudioAttributes}.

     * @hide

     */

    @SystemApi

    @IntRange(from = 0)

    @RequiresPermission(anyOf = {

            android.Manifest.permission.MODIFY_AUDIO_SYSTEM_SETTINGS,

            android.Manifest.permission.MODIFY_AUDIO_ROUTING

    })

    public int getVolumeGroupMinVolumeIndex(int groupId) {

        final IAudioService service = getService();

        try {

            return service.getVolumeGroupMinVolumeIndex(groupId);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

    }



    /**

     * Adjusts the volume of a particular group associated to given id by one step in a direction.

     * <p> If the volume group is associated to a stream type, it fallbacks on

     * {@link #adjustStreamVolume(int, int, int)} for compatibility reason.

     * <p> Call first in prior {@link #getVolumeGroupIdForAttributes(AudioAttributes)} to retrieve

     * the volume group id supporting the given {@link AudioAttributes}.

     *

     * @param groupId of the {@link android.media.audiopolicy.AudioVolumeGroup} to consider.

     * @param direction The direction to adjust the volume. One of

     *            {@link #ADJUST_LOWER}, {@link #ADJUST_RAISE}, or

     *            {@link #ADJUST_SAME}.

     * @param flags One or more flags.

     * @throws SecurityException if the adjustment triggers a Do Not Disturb change and the caller

     * is not granted notification policy access.

     */

    public void adjustVolumeGroupVolume(int groupId, int direction, int flags) {

        IAudioService service = getService();

        try {

            service.adjustVolumeGroupVolume(groupId, direction, flags,

                    getContext().getOpPackageName());

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

    }



    /**

     * Get last audible volume of the group associated to given id before it was muted.

     * <p> Call first in prior {@link #getVolumeGroupIdForAttributes(AudioAttributes)} to retrieve

     * the volume group id supporting the given {@link AudioAttributes}.

     *

     * @param groupId of the {@link android.media.audiopolicy.AudioVolumeGroup} to consider.

     * @return current volume if not muted, volume before muted otherwise.

     * @hide

     */

    @SystemApi

    @RequiresPermission("android.permission.QUERY_AUDIO_STATE")

    @IntRange(from = 0)

    public int getLastAudibleVolumeGroupVolume(int groupId) {

        IAudioService service = getService();

        try {

            return service.getLastAudibleVolumeGroupVolume(groupId);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

    }



    /**

     * Returns the current mute state for a particular volume group associated to the given id.

     * <p> Call first in prior {@link #getVolumeGroupIdForAttributes(AudioAttributes)} to retrieve

     * the volume group id supporting the given {@link AudioAttributes}.

     *

     * @param groupId of the {@link android.media.audiopolicy.AudioVolumeGroup} to consider.

     * @return The mute state for the given {@link android.media.audiopolicy.AudioVolumeGroup} id.

     * @see #adjustVolumeGroupVolume(int, int, int)

     */

    public boolean isVolumeGroupMuted(int groupId) {

        IAudioService service = getService();

        try {

            return service.getMinVolumeIndexForAttributes(attr);

            return service.isVolumeGroupMuted(groupId);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

media/java/android/media/IAudioService.aidl

+16 −9
Original line number Diff line number Diff line
@@ -138,18 +138,25 @@ interface IAudioService { 
    @EnforcePermission("MODIFY_AUDIO_ROUTING")

    List<AudioVolumeGroup> getAudioVolumeGroups();



    @EnforcePermission("MODIFY_AUDIO_ROUTING")

    void setVolumeIndexForAttributes(in AudioAttributes aa, int index, int flags,

            String callingPackage, in String attributionTag);

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

    void setVolumeGroupVolumeIndex(int groupId, int index, int flags, String callingPackage,

            in String attributionTag);



    @EnforcePermission("MODIFY_AUDIO_ROUTING")

    int getVolumeIndexForAttributes(in AudioAttributes aa);

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

    int getVolumeGroupVolumeIndex(int groupId);



    @EnforcePermission("MODIFY_AUDIO_ROUTING")

    int getMaxVolumeIndexForAttributes(in AudioAttributes aa);

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

    int getVolumeGroupMaxVolumeIndex(int groupId);



    @EnforcePermission("MODIFY_AUDIO_ROUTING")

    int getMinVolumeIndexForAttributes(in AudioAttributes aa);

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

    int getVolumeGroupMinVolumeIndex(int groupId);



    @EnforcePermission("QUERY_AUDIO_STATE")

    int getLastAudibleVolumeGroupVolume(int groupId);



    boolean isVolumeGroupMuted(int groupId);



    void adjustVolumeGroupVolume(int groupId, int direction, int flags, String callingPackage);



    @EnforcePermission("QUERY_AUDIO_STATE")

    int getLastAudibleStreamVolume(int streamType);

media/java/android/media/audiopolicy/AudioProductStrategy.java

+10 −0
Original line number Diff line number Diff line
@@ -231,6 +231,16 @@ public final class AudioProductStrategy implements Parcelable { 
        return mId;

    }



    /**

     * @hide

     * @return the product strategy ID (which is the generalisation of Car Audio Usage / legacy

     *         routing_strategy linked to {@link AudioAttributes#getUsage()}).

     */

    @SystemApi

    @NonNull public String getName() {

        return mName;

    }



    /**

     * @hide

     * @return first {@link AudioAttributes} associated to this product strategy.