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

Commit 75ed8617 authored by Anton Hansson's avatar Anton Hansson Committed by Automerger Merge Worker
Browse files

Merge "Fix broken links to AudioVolumeGroup" into main am: 47c10d04 am:... 

Merge "Fix broken links to AudioVolumeGroup" into main am: 47c10d04 am: 5cf090c1 am: a982126a am: 09754592

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2784249



Change-Id: Ic340d4ed40ccc5bf26e24ca39bd26fb8df6ec013
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents dcecad17 09754592

media/java/android/media/AudioManager.java

+4 −5
Original line number Diff line number Diff line
@@ -1485,8 +1485,7 @@ public class AudioManager { 
     * 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,

     * @return audio volume group id supporting the given {@link AudioAttributes} if found,

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

     */

    public int getVolumeGroupIdForAttributes(@NonNull AudioAttributes attributes) {
@@ -1601,7 +1600,7 @@ public class AudioManager { 
     * <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 groupId of the audio volume group to consider.

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

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

     *            {@link #ADJUST_SAME}.
@@ -1645,8 +1644,8 @@ public class AudioManager { 
     * <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.

     * @param groupId of the audio volume group to consider.

     * @return The mute state for the given audio volume group id.

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

     */

    public boolean isVolumeGroupMuted(int groupId) {