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

Commit 270a983d authored by Eric Laurent's avatar Eric Laurent Committed by Automerger Merge Worker
Browse files

Merge "AudioService: fix NPE in... 

Merge "AudioService: fix NPE in AudioDeviceBroker.setCommunicationRouteForClient" into udc-qpr-dev am: 11fe11cf am: 91c6b5a8

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24404418



Change-Id: I920c399b91f59239fb52f7c2db8ca48416ae3e31
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 94f0b6fa 91c6b5a8

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

+1 −1
Original line number Diff line number Diff line
@@ -435,7 +435,7 @@ public class AudioDeviceBroker { 
        // LE Audio it stays the same and we must trigger the proper stream volume alignment, if

        // LE Audio communication device is activated after the audio system has already switched to

        // MODE_IN_CALL mode.

        if (isBluetoothLeAudioRequested()) {

        if (isBluetoothLeAudioRequested() && device != null) {

            final int streamType = mAudioService.getBluetoothContextualVolumeStream();

            final int leAudioVolIndex = getVssVolumeForDevice(streamType, device.getInternalType());

            final int leAudioMaxVolIndex = getMaxVssVolumeForStream(streamType);