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

Commit a43811a9 authored by Andre Eisenbach's avatar Andre Eisenbach Committed by Gerrit Code Review
Browse files

Merge "Send error for if VR is initiated during call."

parents 39c50726 b23390c1

src/com/android/bluetooth/hfp/HeadsetStateMachine.java

+6 −3
Original line number Diff line number Diff line
@@ -2183,9 +2183,7 @@ final class HeadsetStateMachine extends StateMachine { 
            mVoiceRecognitionStarted + " mWaitingforVoiceRecognition: " + mWaitingForVoiceRecognition +

            " isInCall: " + isInCall());

        if (state == HeadsetHalConstants.VR_STATE_STARTED) {

            if (!isVirtualCallInProgress() &&

                !isInCall())

            {

            if (!isVirtualCallInProgress() && !isInCall()) {

                IDeviceIdleController dic = IDeviceIdleController.Stub.asInterface(

                        ServiceManager.getService(Context.DEVICE_IDLE_CONTROLLER));

                if (dic != null) {
@@ -2202,6 +2200,11 @@ final class HeadsetStateMachine extends StateMachine { 
                    return;

                }

                expectVoiceRecognition(device);

            } else {

                // send error response if call is ongoing

                atResponseCodeNative(HeadsetHalConstants.AT_RESPONSE_ERROR,

                        0, getByteAddress(device));

                return;

            }

        } else if (state == HeadsetHalConstants.VR_STATE_STOPPED) {

            if (mVoiceRecognitionStarted || mWaitingForVoiceRecognition)