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

Commit 118ab4d9 authored by Vlad Popa's avatar Vlad Popa
Browse files

Replace stream state primitive arrays with SparseArrays 

This is necessary since after the internal removal of
STREAM_BLUETOOTH_SCO we now do not have values assigner for the
primitive array index belonging to sco. Using SparseArrays offers better
null pointer and invalid index handling.

Flag: com.android.media.audio.replace_stream_bt_sco
Test: atest AudioManagerTest/AudioDeviceVolumeManagerTest/VolumeHelperTest and manual tests
Bug: 345024266
Change-Id: I3d24485fb6285025f403976ba5b9d8cf9338edfb
parent 33b5cb78

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

+285 −202

File changed.

Preview size limit exceeded, changes collapsed.

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

+3 −3
Original line number Diff line number Diff line
@@ -633,7 +633,7 @@ public class SoundDoseHelper { 
    }



    /*package*/ void enforceSafeMediaVolume(String caller) {

        AudioService.VolumeStreamState streamState = mAudioService.getVssVolumeForStream(

        AudioService.VolumeStreamState streamState = mAudioService.getVssForStreamOrDefault(

                AudioSystem.STREAM_MUSIC);



        for (int i = 0; i < mSafeMediaVolumeDevices.size(); ++i)  {
@@ -665,7 +665,7 @@ public class SoundDoseHelper { 
    @GuardedBy("mSafeMediaVolumeStateLock")

    private boolean checkSafeMediaVolume_l(int streamType, int index, int device) {

        return (mSafeMediaVolumeState == SAFE_MEDIA_VOLUME_ACTIVE)

                    && (AudioService.mStreamVolumeAlias[streamType] == AudioSystem.STREAM_MUSIC)

                    && (AudioService.sStreamVolumeAlias.get(streamType) == AudioSystem.STREAM_MUSIC)

                    && safeDevicesContains(device)

                    && (index > safeMediaVolumeIndex(device));

    }
@@ -908,7 +908,7 @@ public class SoundDoseHelper { 
                return;

            }



            if (AudioService.mStreamVolumeAlias[streamType] == AudioSystem.STREAM_MUSIC

            if (AudioService.sStreamVolumeAlias.get(streamType) == AudioSystem.STREAM_MUSIC

                    && safeDevicesContains(device)) {

                float attenuationDb = -AudioSystem.getStreamVolumeDB(AudioSystem.STREAM_MUSIC,

                        (newIndex + 5) / 10, device);