diff options
| author | Eric Laurent <elaurent@google.com> | 2011-05-25 16:22:36 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-05-25 16:22:36 -0700 |
| commit | 6662576d8faff84b4f68eb9b96df42b5826471f2 (patch) | |
| tree | 8c263a6808e856644b0cae60839a716b94ab4d29 /media | |
| parent | 4175a9085ee38a0a14db898ea51faa4d01219caa (diff) | |
| parent | b06ac839dd2d0437fc8314f6deb7233af5af521e (diff) | |
| download | frameworks_base-6662576d8faff84b4f68eb9b96df42b5826471f2.zip frameworks_base-6662576d8faff84b4f68eb9b96df42b5826471f2.tar.gz frameworks_base-6662576d8faff84b4f68eb9b96df42b5826471f2.tar.bz2 | |
Merge "Issue 4364098: bluetooth SCO not working"
Diffstat (limited to 'media')
| -rw-r--r-- | media/java/android/media/AudioService.java | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/media/java/android/media/AudioService.java b/media/java/android/media/AudioService.java index 4e77fcb..0876bbf 100644 --- a/media/java/android/media/AudioService.java +++ b/media/java/android/media/AudioService.java @@ -1437,9 +1437,7 @@ public class AudioService extends IAudioService.Stub { if (mBluetoothHeadsetDevice != null) { if (mBluetoothHeadset != null) { if (!mBluetoothHeadset.stopVoiceRecognition( - mBluetoothHeadsetDevice) || - !mBluetoothHeadset.stopScoUsingVirtualVoiceCall( - mBluetoothHeadsetDevice)) { + mBluetoothHeadsetDevice)) { sendMsg(mAudioHandler, MSG_BT_HEADSET_CNCT_FAILED, 0, SENDMSG_REPLACE, 0, 0, null, 0); } @@ -1506,8 +1504,6 @@ public class AudioService extends IAudioService.Stub { break; case SCO_STATE_DEACTIVATE_EXT_REQ: status = mBluetoothHeadset.stopVoiceRecognition( - mBluetoothHeadsetDevice) && - mBluetoothHeadset.stopScoUsingVirtualVoiceCall( mBluetoothHeadsetDevice); } } |