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

Commit 25fc29b3 authored by Eric Laurent's avatar Eric Laurent
Browse files

AudioService: do not use virtual call for bt sco 

Do not use startScoUsingVirtualVoiceCall() BluetoothHeadset
API to connect SCO audio. This will cause headsets to act as if an incoming
call was received which is not what we want for voice commands.

Bug 8157702

Change-Id: I271909d4d1f3822758740a8484e3d2d8b4f34c00
parent 41c07671

media/java/android/media/AudioService.java

+5 −9
Original line number Diff line number Diff line
@@ -357,7 +357,7 @@ public class AudioService extends IAudioService.Stub implements OnFinished { 
    private static final int SCO_STATE_INACTIVE = 0;

    // SCO audio activation request waiting for headset service to connect

    private static final int SCO_STATE_ACTIVATE_REQ = 1;

    // SCO audio state is active or starting due to a local request to start a virtual call

    // SCO audio state is active or starting due to a request from AudioManager API

    private static final int SCO_STATE_ACTIVE_INTERNAL = 3;

    // SCO audio deactivation request waiting for headset service to connect

    private static final int SCO_STATE_DEACTIVATE_REQ = 5;
@@ -2053,8 +2053,7 @@ public class AudioService extends IAudioService.Stub implements OnFinished { 
                                 mScoAudioState == SCO_STATE_DEACTIVATE_REQ)) {

                            if (mScoAudioState == SCO_STATE_INACTIVE) {

                                if (mBluetoothHeadset != null && mBluetoothHeadsetDevice != null) {

                                    if (mBluetoothHeadset.startScoUsingVirtualVoiceCall(

                                            mBluetoothHeadsetDevice)) {

                                    if (mBluetoothHeadset.connectAudio()) {

                                        mScoAudioState = SCO_STATE_ACTIVE_INTERNAL;

                                    } else {

                                        broadcastScoConnectionState(
@@ -2076,8 +2075,7 @@ public class AudioService extends IAudioService.Stub implements OnFinished { 
                               mScoAudioState == SCO_STATE_ACTIVATE_REQ)) {

                    if (mScoAudioState == SCO_STATE_ACTIVE_INTERNAL) {

                        if (mBluetoothHeadset != null && mBluetoothHeadsetDevice != null) {

                            if (!mBluetoothHeadset.stopScoUsingVirtualVoiceCall(

                                    mBluetoothHeadsetDevice)) {

                            if (!mBluetoothHeadset.disconnectAudio()) {

                                mScoAudioState = SCO_STATE_INACTIVE;

                                broadcastScoConnectionState(

                                        AudioManager.SCO_AUDIO_STATE_DISCONNECTED);
@@ -2250,12 +2248,10 @@ public class AudioService extends IAudioService.Stub implements OnFinished { 
                            switch (mScoAudioState) {

                            case SCO_STATE_ACTIVATE_REQ:

                                mScoAudioState = SCO_STATE_ACTIVE_INTERNAL;

                                status = mBluetoothHeadset.startScoUsingVirtualVoiceCall(

                                        mBluetoothHeadsetDevice);

                                status = mBluetoothHeadset.connectAudio();

                                break;

                            case SCO_STATE_DEACTIVATE_REQ:

                                status = mBluetoothHeadset.stopScoUsingVirtualVoiceCall(

                                        mBluetoothHeadsetDevice);

                                status = mBluetoothHeadset.disconnectAudio();

                                break;

                            case SCO_STATE_DEACTIVATE_EXT_REQ:

                                status = mBluetoothHeadset.stopVoiceRecognition(