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

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

Merge "AudioService: fix voice volume adjustments" into main am: ef70b87c 

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



Change-Id: I609dfffbf66704100e40f41258b2cac879f1c5b4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 47e40f7c ef70b87c

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

+2 −1
Original line number Diff line number Diff line
@@ -7695,7 +7695,8 @@ public class AudioService extends IAudioService.Stub 
                return AudioSystem.STREAM_RING;

            }

        default:

            if (isInCommunication()) {

            if (isInCommunication()

                    || mAudioSystem.isStreamActive(AudioManager.STREAM_VOICE_CALL, 0)) {

                if (!replaceStreamBtSco()

                        && mBtCommDeviceActive.get() == BT_COMM_DEVICE_ACTIVE_SCO) {

                    if (DEBUG_VOL) Log.v(TAG, "getActiveStreamType: Forcing STREAM_BLUETOOTH_SCO");