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

Commit 6662576d authored by Eric Laurent's avatar Eric Laurent Committed by Android (Google) Code Review
Browse files

Merge "Issue 4364098: bluetooth SCO not working"

parents 4175a908 b06ac839

media/java/android/media/AudioService.java

+1 −5
Original line number Original line Diff line number Diff line
@@ -1437,8 +1437,6 @@ public class AudioService extends IAudioService.Stub { 
                if (mBluetoothHeadsetDevice != null) {

                if (mBluetoothHeadsetDevice != null) {

                    if (mBluetoothHeadset != null) {

                    if (mBluetoothHeadset != null) {

                        if (!mBluetoothHeadset.stopVoiceRecognition(

                        if (!mBluetoothHeadset.stopVoiceRecognition(

                                mBluetoothHeadsetDevice) ||

                                !mBluetoothHeadset.stopScoUsingVirtualVoiceCall(

                                mBluetoothHeadsetDevice)) {

                                mBluetoothHeadsetDevice)) {

                            sendMsg(mAudioHandler, MSG_BT_HEADSET_CNCT_FAILED, 0,

                            sendMsg(mAudioHandler, MSG_BT_HEADSET_CNCT_FAILED, 0,

                                    SENDMSG_REPLACE, 0, 0, null, 0);

                                    SENDMSG_REPLACE, 0, 0, null, 0);
@@ -1506,8 +1504,6 @@ public class AudioService extends IAudioService.Stub { 
                            break;

                            break;

                        case SCO_STATE_DEACTIVATE_EXT_REQ:

                        case SCO_STATE_DEACTIVATE_EXT_REQ:

                            status = mBluetoothHeadset.stopVoiceRecognition(

                            status = mBluetoothHeadset.stopVoiceRecognition(

                                    mBluetoothHeadsetDevice) &&

                                    mBluetoothHeadset.stopScoUsingVirtualVoiceCall(

                                    mBluetoothHeadsetDevice);

                                    mBluetoothHeadsetDevice);

                        }

                        }

                    }

                    }