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

Commit d5ac539b authored by Jean-Michel Trivi's avatar Jean-Michel Trivi Committed by Android (Google) Code Review
Browse files

Merge "AudioService: fix volume code path with a null audio device" into main

parents 1f50aa3c a8247087

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

+4 −2
Original line number Diff line number Diff line
@@ -4600,7 +4600,7 @@ public class AudioService extends IAudioService.Stub 
    }















    private void setStreamVolume(int streamType, int index, int flags,













            @NonNull AudioDeviceAttributes ada,













            @Nullable AudioDeviceAttributes ada,















            String callingPackage, String caller, String attributionTag, int uid,















            boolean hasModifyAudioSettings,















            boolean canChangeMuteAndUpdateController) {









@@ -4618,7 +4618,9 @@ public class AudioService extends IAudioService.Stub













        int streamTypeAlias = mStreamVolumeAlias[streamType];















        VolumeStreamState streamState = mStreamStates[streamTypeAlias];



























        final int device = ada.getInternalType();













        final int device = (ada == null)













                ? getDeviceForStream(streamType)













                : ada.getInternalType();















        int oldIndex;





























        // skip a2dp absolute volume control request when the device