Merge "For virtual call, Reject SCO connection for HFP if HFPC is connected" (81450933) · Commits · e / os / android_packages_modules_Bluetooth

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

+15 −0

Original line number	Diff line number	Diff line
		@@ -1175,6 +1175,11 @@ public class HeadsetService extends ProfileService {
		Log.w(TAG, "startVoiceRecognition: " + device + " is not connected or connecting");
		return false;
		}
		if (SystemProperties.getBoolean(REJECT_SCO_IF_HFPC_CONNECTED_PROPERTY, false)
		&& isHeadsetClientConnected()) {
		Log.w(TAG, "startVoiceRecognition: rejected SCO since HFPC is connected!");
		return false;
		}
		mVoiceRecognitionStarted = true;
		if (pendingRequestByHeadset) {
		stateMachine.sendMessage(HeadsetStateMachine.VOICE_RECOGNITION_RESULT,
		@@ -1587,6 +1592,11 @@ public class HeadsetService extends ProfileService {
		Log.w(TAG, "startScoUsingVirtualVoiceCall: no active device");
		return false;
		}
		if (SystemProperties.getBoolean(REJECT_SCO_IF_HFPC_CONNECTED_PROPERTY, false)
		&& isHeadsetClientConnected()) {
		Log.w(TAG, "startScoUsingVirtualVoiceCall: rejected SCO since HFPC is connected!");
		return false;
		}
		mVirtualCallStarted = true;
		// Send virtual phone state changed to initialize SCO
		phoneStateChanged(0, 0, HeadsetHalConstants.CALL_STATE_DIALING, "", 0, "", true);
		@@ -1760,6 +1770,11 @@ public class HeadsetService extends ProfileService {
		Log.w(TAG, "startVoiceRecognitionByHeadset: failed request from " + fromDevice);
		return false;
		}
		if (SystemProperties.getBoolean(REJECT_SCO_IF_HFPC_CONNECTED_PROPERTY, false)
		&& isHeadsetClientConnected()) {
		Log.w(TAG, "startVoiceRecognitionByHeadset: rejected SCO since HFPC is connected!");
		return false;
		}
		mVoiceRecognitionTimeoutEvent = new VoiceRecognitionTimeoutEvent(fromDevice);
		getStateMachinesThreadHandler()
		.postDelayed(mVoiceRecognitionTimeoutEvent, sStartVrTimeoutMs);