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

Commit 0add7733 authored by Hongwei Wang's avatar Hongwei Wang Committed by Android (Google) Code Review
Browse files

Merge "Addresses API review feedback on AudioVolumeGroup(s)"

parents fbc743f1 af1b72c8

api/system-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -3695,7 +3695,7 @@ package android.media.audiopolicy { 














  public final class AudioVolumeGroup implements android.os.Parcelable {















    method public int describeContents();













    method public java.util.List<android.media.AudioAttributes> getAudioAttributes();













    method @NonNull public java.util.List<android.media.AudioAttributes> getAudioAttributes();















    method public int getId();















    method @NonNull public int[] getLegacyStreamTypes();















    method @NonNull public String name();









@@ -3707,7 +3707,7 @@ package android.media.audiopolicy {













    ctor public AudioVolumeGroups();















    method public int describeContents();















    method @Nullable public android.media.audiopolicy.AudioVolumeGroup getById(int);













    method public java.util.Iterator<android.media.audiopolicy.AudioVolumeGroup> iterator();













    method @NonNull public java.util.Iterator<android.media.audiopolicy.AudioVolumeGroup> iterator();















    method public int size();















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















    field public static final android.os.Parcelable.Creator<android.media.audiopolicy.AudioVolumeGroups> CREATOR;

































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



+1
−1




























Original line number
Diff line number
Diff line








@@ -77,7 +77,7 @@ public final class AudioVolumeGroup implements Parcelable {













    /**















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















     */













    public List<AudioAttributes> getAudioAttributes() {













    public @NonNull List<AudioAttributes> getAudioAttributes() {















        return Arrays.asList(mAudioAttributes);















    }

















































media/java/android/media/audiopolicy/AudioVolumeGroups.java



+1
−1




























Original line number
Diff line number
Diff line








@@ -70,7 +70,7 @@ public final class AudioVolumeGroups implements Iterable<AudioVolumeGroup>, Parc













     * Returns an {@link Iterator}















     */















    @Override













    public Iterator<AudioVolumeGroup> iterator() {













    public @NonNull Iterator<AudioVolumeGroup> iterator() {















        return mAudioVolumeGroupList.iterator();















    }