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

Commit 1baf5540 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "AudioVolumeGroup: implement hashCode method" into main

parents af3f73fd 8d4310e0

media/java/android/media/AudioManager.java

+1 −0
Original line number Diff line number Diff line
@@ -8617,6 +8617,7 @@ public class AudioManager { 
    @SystemApi

    @NonNull

    @RequiresPermission(Manifest.permission.MODIFY_AUDIO_ROUTING)

    // TODO also open to MODIFY_AUDIO_SETTINGS_PRIVILEGED b/341780042

    public static List<AudioVolumeGroup> getAudioVolumeGroups() {

        final IAudioService service = getService();

        try {

media/java/android/media/IAudioService.aidl

+1 −1
Original line number Diff line number Diff line
@@ -142,7 +142,7 @@ interface IAudioService { 
    @UnsupportedAppUsage

    int getStreamMaxVolume(int streamType);



    @EnforcePermission("MODIFY_AUDIO_ROUTING")

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

    List<AudioVolumeGroup> getAudioVolumeGroups();



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

media/java/android/media/audiopolicy/AudioVolumeGroup.java

+7 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ import com.android.internal.util.Preconditions; 
import java.util.ArrayList;

import java.util.Arrays;

import java.util.List;

import java.util.Objects;



/**

 * A class to create the association between different playback attributes
@@ -118,6 +119,12 @@ public final class AudioVolumeGroup implements Parcelable { 
                && Arrays.equals(mAudioAttributes, thatAvg.mAudioAttributes);

    }



    @Override

    public int hashCode() {

        return Objects.hash(mName, mId,

                Arrays.hashCode(mAudioAttributes), Arrays.hashCode(mLegacyStreamTypes));

    }



    /**

     * @return List of {@link AudioAttributes} involved in this {@link AudioVolumeGroup}.

     */

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

+4 −1
Original line number Diff line number Diff line
@@ -2123,7 +2123,10 @@ public class AudioService extends IAudioService.Stub 
        return AudioProductStrategy.getAudioProductStrategies();

    }













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













    @android.annotation.EnforcePermission(anyOf = {













            MODIFY_AUDIO_SETTINGS_PRIVILEGED,













            android.Manifest.permission.MODIFY_AUDIO_ROUTING













    })















    /**















     * @return the List of {@link android.media.audiopolicy.AudioVolumeGroup} discovered from the















     * platform configuration file.