Merge "Bluetooth: use virtual sco calls for VOIP" (c1581b43) · Commits · e / os / android_frameworks_base

media/java/android/media/AudioService.java

+3 −19

Original line number	Diff line number	Diff line
		@@ -2157,12 +2157,8 @@ public class AudioService extends IAudioService.Stub {
		SCO_MODE_VIRTUAL_CALL : SCO_MODE_RAW;
		if (mBluetoothHeadset != null && mBluetoothHeadsetDevice != null) {
		boolean status;
		if (mScoAudioMode == SCO_MODE_RAW) {
		status = mBluetoothHeadset.connectAudio();
		} else {
		status = mBluetoothHeadset.startScoUsingVirtualVoiceCall(
		mBluetoothHeadsetDevice);
		}
		if (status) {
		mScoAudioState = SCO_STATE_ACTIVE_INTERNAL;
		} else {
		@@ -2186,12 +2182,8 @@ public class AudioService extends IAudioService.Stub {
		if (mScoAudioState == SCO_STATE_ACTIVE_INTERNAL) {
		if (mBluetoothHeadset != null && mBluetoothHeadsetDevice != null) {
		boolean status;
		if (mScoAudioMode == SCO_MODE_RAW) {
		status = mBluetoothHeadset.disconnectAudio();
		} else {
		status = mBluetoothHeadset.stopScoUsingVirtualVoiceCall(
		mBluetoothHeadsetDevice);
		}
		if (!status) {
		mScoAudioState = SCO_STATE_INACTIVE;
		broadcastScoConnectionState(
		@@ -2367,20 +2359,12 @@ public class AudioService extends IAudioService.Stub {
		switch (mScoAudioState) {
		case SCO_STATE_ACTIVATE_REQ:
		mScoAudioState = SCO_STATE_ACTIVE_INTERNAL;
		if (mScoAudioMode == SCO_MODE_RAW) {
		status = mBluetoothHeadset.connectAudio();
		} else {
		status = mBluetoothHeadset.startScoUsingVirtualVoiceCall(
		mBluetoothHeadsetDevice);
		}
		break;
		case SCO_STATE_DEACTIVATE_REQ:
		if (mScoAudioMode == SCO_MODE_RAW) {
		status = mBluetoothHeadset.disconnectAudio();
		} else {
		status = mBluetoothHeadset.stopScoUsingVirtualVoiceCall(
		mBluetoothHeadsetDevice);
		}
		break;
		case SCO_STATE_DEACTIVATE_EXT_REQ:
		status = mBluetoothHeadset.stopVoiceRecognition(