diff options
| author | Eric Laurent <elaurent@google.com> | 2013-04-05 22:14:12 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-04-05 22:14:13 +0000 |
| commit | e8d9d2b3352bdeba0a455666bda9eb64b75198f7 (patch) | |
| tree | 9d9b0011badeb829195aac1d130c28b83bd6bbf6 | |
| parent | a1ca6faceed2eb8fba81bd7e30b3a5bae82cd484 (diff) | |
| parent | 25fc29b3691a1d2a84164988dc74b2e7d301868e (diff) | |
| download | frameworks_base-e8d9d2b3352bdeba0a455666bda9eb64b75198f7.zip frameworks_base-e8d9d2b3352bdeba0a455666bda9eb64b75198f7.tar.gz frameworks_base-e8d9d2b3352bdeba0a455666bda9eb64b75198f7.tar.bz2 | |
Merge "AudioService: do not use virtual call for bt sco" into jb-mr2-dev
| -rw-r--r-- | media/java/android/media/AudioService.java | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/media/java/android/media/AudioService.java b/media/java/android/media/AudioService.java index fd71d79..b22aa1d 100644 --- a/media/java/android/media/AudioService.java +++ b/media/java/android/media/AudioService.java @@ -357,7 +357,7 @@ public class AudioService extends IAudioService.Stub implements OnFinished { private static final int SCO_STATE_INACTIVE = 0; // SCO audio activation request waiting for headset service to connect private static final int SCO_STATE_ACTIVATE_REQ = 1; - // SCO audio state is active or starting due to a local request to start a virtual call + // SCO audio state is active or starting due to a request from AudioManager API private static final int SCO_STATE_ACTIVE_INTERNAL = 3; // SCO audio deactivation request waiting for headset service to connect private static final int SCO_STATE_DEACTIVATE_REQ = 5; @@ -2053,8 +2053,7 @@ public class AudioService extends IAudioService.Stub implements OnFinished { mScoAudioState == SCO_STATE_DEACTIVATE_REQ)) { if (mScoAudioState == SCO_STATE_INACTIVE) { if (mBluetoothHeadset != null && mBluetoothHeadsetDevice != null) { - if (mBluetoothHeadset.startScoUsingVirtualVoiceCall( - mBluetoothHeadsetDevice)) { + if (mBluetoothHeadset.connectAudio()) { mScoAudioState = SCO_STATE_ACTIVE_INTERNAL; } else { broadcastScoConnectionState( @@ -2076,8 +2075,7 @@ public class AudioService extends IAudioService.Stub implements OnFinished { mScoAudioState == SCO_STATE_ACTIVATE_REQ)) { if (mScoAudioState == SCO_STATE_ACTIVE_INTERNAL) { if (mBluetoothHeadset != null && mBluetoothHeadsetDevice != null) { - if (!mBluetoothHeadset.stopScoUsingVirtualVoiceCall( - mBluetoothHeadsetDevice)) { + if (!mBluetoothHeadset.disconnectAudio()) { mScoAudioState = SCO_STATE_INACTIVE; broadcastScoConnectionState( AudioManager.SCO_AUDIO_STATE_DISCONNECTED); @@ -2250,12 +2248,10 @@ public class AudioService extends IAudioService.Stub implements OnFinished { switch (mScoAudioState) { case SCO_STATE_ACTIVATE_REQ: mScoAudioState = SCO_STATE_ACTIVE_INTERNAL; - status = mBluetoothHeadset.startScoUsingVirtualVoiceCall( - mBluetoothHeadsetDevice); + status = mBluetoothHeadset.connectAudio(); break; case SCO_STATE_DEACTIVATE_REQ: - status = mBluetoothHeadset.stopScoUsingVirtualVoiceCall( - mBluetoothHeadsetDevice); + status = mBluetoothHeadset.disconnectAudio(); break; case SCO_STATE_DEACTIVATE_EXT_REQ: status = mBluetoothHeadset.stopVoiceRecognition( |