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

Commit 4d285810 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 974f8ae2 1d053f7e

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

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

            mVoiceRecognitionStarted + " mWaitingforVoiceRecognition: " + mWaitingForVoiceRecognition +

            " isInCall: " + isInCall());

            " isInCall: " + isInCall());

        if (state == HeadsetHalConstants.VR_STATE_STARTED) {

        if (state == HeadsetHalConstants.VR_STATE_STARTED) {

            if (!isVirtualCallInProgress() &&

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

                !isInCall())

            {

                IDeviceIdleController dic = IDeviceIdleController.Stub.asInterface(

                IDeviceIdleController dic = IDeviceIdleController.Stub.asInterface(

                        ServiceManager.getService(Context.DEVICE_IDLE_CONTROLLER));

                        ServiceManager.getService(Context.DEVICE_IDLE_CONTROLLER));

                if (dic != null) {

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

                    return;

                }

                }

                expectVoiceRecognition(device);

                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) {

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

            if (mVoiceRecognitionStarted || mWaitingForVoiceRecognition)

            if (mVoiceRecognitionStarted || mWaitingForVoiceRecognition)