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

Commit ebd6aaa4 authored by Hayden Gomes's avatar Hayden Gomes
Browse files

Replacing AudioVolumeGroups with List 

Bug: 129262395
Test: Built and ran on device
Change-Id: I838296ead584b85be50028c410b9a2d0ba3b0398
parent 3c562e24

api/system-current.txt

+1 −11
Original line number Diff line number Diff line
@@ -3498,7 +3498,7 @@ package android.media { 
    method public void clearAudioServerStateCallback();

    method @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public int dispatchAudioFocusChange(@NonNull android.media.AudioFocusInfo, int, @NonNull android.media.audiopolicy.AudioPolicy);

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

    method @NonNull @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public android.media.audiopolicy.AudioVolumeGroups getAudioVolumeGroups();

    method @NonNull @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public static java.util.List<android.media.audiopolicy.AudioVolumeGroup> getAudioVolumeGroups();

    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);

    method @IntRange(from=0) @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public int getVolumeIndexForAttributes(@NonNull android.media.AudioAttributes);
@@ -3693,16 +3693,6 @@ package android.media.audiopolicy { 
    method @NonNull public String name();

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

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

  }













  public final class AudioVolumeGroups implements java.lang.Iterable<android.media.audiopolicy.AudioVolumeGroup> android.os.Parcelable {













    ctor public AudioVolumeGroups();













    method public int describeContents();













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













    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;















    field public static final int DEFAULT_VOLUME_GROUP = -1; // 0xffffffff















  }















































core/java/android/preference/SeekBarVolumizer.java



+8
−8




























Original line number
Diff line number
Diff line








@@ -29,7 +29,7 @@ import android.media.AudioManager;













import android.media.Ringtone;















import android.media.RingtoneManager;















import android.media.audiopolicy.AudioProductStrategy;













import android.media.audiopolicy.AudioVolumeGroups;













import android.media.audiopolicy.AudioVolumeGroup;















import android.net.Uri;















import android.os.Handler;















import android.os.HandlerThread;










@@ -196,7 +196,7 @@ public class SeekBarVolumizer implements OnSeekBarChangeListener, Handler.Callba













        for (final AudioProductStrategy productStrategy :















                AudioManager.getAudioProductStrategies()) {















            int volumeGroupId = productStrategy.getVolumeGroupIdForLegacyStreamType(streamType);













            if (volumeGroupId != AudioVolumeGroups.DEFAULT_VOLUME_GROUP) {













            if (volumeGroupId != AudioVolumeGroup.DEFAULT_VOLUME_GROUP) {















                return volumeGroupId;















            }















        }









@@ -204,9 +204,9 @@ public class SeekBarVolumizer implements OnSeekBarChangeListener, Handler.Callba













        return AudioManager.getAudioProductStrategies().stream()















                .map(strategy -> strategy.getVolumeGroupIdForAudioAttributes(















                        AudioProductStrategy.sDefaultAttributes))













                .filter(volumeGroupId -> volumeGroupId != AudioVolumeGroups.DEFAULT_VOLUME_GROUP)













                .filter(volumeGroupId -> volumeGroupId != AudioVolumeGroup.DEFAULT_VOLUME_GROUP)















                .findFirst()













                .orElse(AudioVolumeGroups.DEFAULT_VOLUME_GROUP);













                .orElse(AudioVolumeGroup.DEFAULT_VOLUME_GROUP);















    }































    private @NonNull AudioAttributes getAudioAttributesForLegacyStreamType(int streamType) {










@@ -556,7 +556,7 @@ public class SeekBarVolumizer implements OnSeekBarChangeListener, Handler.Callba













                    updateVolumeSlider(streamType, streamVolume);















                } else {















                    int volumeGroup = getVolumeGroupIdForLegacyStreamType(streamType);













                    if (volumeGroup != AudioVolumeGroups.DEFAULT_VOLUME_GROUP













                    if (volumeGroup != AudioVolumeGroup.DEFAULT_VOLUME_GROUP















                            && volumeGroup == mVolumeGroupId) {















                        int streamVolume = mAudioManager.getStreamVolume(streamType);















                        updateVolumeSlider(streamType, streamVolume);










@@ -589,14 +589,14 @@ public class SeekBarVolumizer implements OnSeekBarChangeListener, Handler.Callba













    }































    private void registerVolumeGroupCb() {













        if (mVolumeGroupId != AudioVolumeGroups.DEFAULT_VOLUME_GROUP) {













        if (mVolumeGroupId != AudioVolumeGroup.DEFAULT_VOLUME_GROUP) {















            mAudioManager.registerVolumeGroupCallback(Runnable::run, mVolumeGroupCallback);















            mLastProgress = mAudioManager.getVolumeIndexForAttributes(mAttributes);















        }















    }































    private void unregisterVolumeGroupCb() {













        if (mVolumeGroupId != AudioVolumeGroups.DEFAULT_VOLUME_GROUP) {













        if (mVolumeGroupId != AudioVolumeGroup.DEFAULT_VOLUME_GROUP) {















            mAudioManager.unregisterVolumeGroupCallback(mVolumeGroupCallback);















        }















    }









@@ -609,7 +609,7 @@ public class SeekBarVolumizer implements OnSeekBarChangeListener, Handler.Callba













                case MSG_GROUP_VOLUME_CHANGED:















                    int group = (int) args.arg1;















                    if (mVolumeGroupId != group













                            || mVolumeGroupId == AudioVolumeGroups.DEFAULT_VOLUME_GROUP) {













                            || mVolumeGroupId == AudioVolumeGroup.DEFAULT_VOLUME_GROUP) {















                        return;















                    }















                    updateSlider();

































core/jni/android_media_AudioVolumeGroups.cpp



+1
−1




























Original line number
Diff line number
Diff line








@@ -39,7 +39,7 @@













using namespace android;































// ----------------------------------------------------------------------------













static const char* const kClassPathName = "android/media/audiopolicy/AudioVolumeGroups";













static const char* const kClassPathName = "android/media/audiopolicy/AudioVolumeGroup";















static const char* const kAudioVolumeGroupClassPathName =















        "android/media/audiopolicy/AudioVolumeGroup";

















































media/java/android/media/AudioManager.java



+6
−5




























Original line number
Diff line number
Diff line








@@ -38,8 +38,8 @@ import android.content.Intent;













import android.media.audiopolicy.AudioPolicy;















import android.media.audiopolicy.AudioPolicy.AudioPolicyFocusListener;















import android.media.audiopolicy.AudioProductStrategy;













import android.media.audiopolicy.AudioVolumeGroup;















import android.media.audiopolicy.AudioVolumeGroupChangeHandler;













import android.media.audiopolicy.AudioVolumeGroups;















import android.media.projection.MediaProjection;















import android.media.session.MediaController;















import android.media.session.MediaSession;










@@ -5422,15 +5422,16 @@ public class AudioManager {













     * Introspection API to retrieve audio volume groups.















     * When implementing {Car|Oem}AudioManager, use this method  to retrieve the collection of















     * audio volume groups.













     * @return a (possibly zero-length) array of













     *         {@see android.media.audiopolicy.AudioVolumeGroups} objects.













     * @return a (possibly zero-length) List of













     *         {@see android.media.audiopolicy.AudioVolumeGroup} objects.















     */















    @SystemApi













    @NonNull















    @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING)













    public @NonNull AudioVolumeGroups getAudioVolumeGroups() {













    public static List<AudioVolumeGroup> getAudioVolumeGroups() {















        final IAudioService service = getService();















        try {













            return service.listAudioVolumeGroups();













            return service.getAudioVolumeGroups();















        } catch (RemoteException e) {















            throw e.rethrowFromSystemServer();















        }

































media/java/android/media/IAudioService.aidl



+2
−2




























Original line number
Diff line number
Diff line








@@ -34,7 +34,7 @@ import android.media.PlayerBase;













import android.media.VolumePolicy;















import android.media.audiopolicy.AudioPolicyConfig;















import android.media.audiopolicy.AudioProductStrategy;













import android.media.audiopolicy.AudioVolumeGroups;













import android.media.audiopolicy.AudioVolumeGroup;















import android.media.audiopolicy.IAudioPolicyCallback;















import android.media.projection.IMediaProjection;















import android.net.Uri;










@@ -86,7 +86,7 @@ interface IAudioService {













    @UnsupportedAppUsage















    int getStreamMaxVolume(int streamType);





























    AudioVolumeGroups listAudioVolumeGroups();













    List<AudioVolumeGroup> getAudioVolumeGroups();































    void setVolumeIndexForAttributes(in AudioAttributes aa, int index, int flags, String callingPackage);