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

Commit d1039dd4 authored by Vlad Popa's avatar Vlad Popa Committed by Android (Google) Code Review
Browse files

Merge "Replace stream state primitive arrays with SparseArrays" into main

parents 886cfb2a 118ab4d9

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