diff options
| author | Eric Laurent <elaurent@google.com> | 2010-12-16 16:05:16 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-12-16 16:05:16 -0800 |
| commit | 74de24045c00d641e79483b459d7d00d3d5bffe3 (patch) | |
| tree | f827b14ba8b9bc8314e938b8d35aae7ee46e4664 | |
| parent | 7d44e4da3bc3d56c6a9aed1f27f51cfd5b54108f (diff) | |
| parent | 0f01764099d7a65b8921725df3340140f9fc4cd5 (diff) | |
| download | frameworks_av-74de24045c00d641e79483b459d7d00d3d5bffe3.zip frameworks_av-74de24045c00d641e79483b459d7d00d3d5bffe3.tar.gz frameworks_av-74de24045c00d641e79483b459d7d00d3d5bffe3.tar.bz2 | |
am 5a756fb0: Merge "Fix issue 2712130: Sholes: problem when playing audio while recording over bluetooth SCO." into gingerbread
* commit '5a756fb0f1f3f8cd7612284c889dfc69875577a8':
Fix issue 2712130: Sholes: problem when playing audio while recording over bluetooth SCO.
| -rw-r--r-- | media/libmedia/AudioSystem.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/media/libmedia/AudioSystem.cpp b/media/libmedia/AudioSystem.cpp index 7e3b743..9c2a8ba 100644 --- a/media/libmedia/AudioSystem.cpp +++ b/media/libmedia/AudioSystem.cpp @@ -763,7 +763,8 @@ bool AudioSystem::isBluetoothScoDevice(audio_devices device) if ((popCount(device) == 1 ) && (device & (AudioSystem::DEVICE_OUT_BLUETOOTH_SCO | AudioSystem::DEVICE_OUT_BLUETOOTH_SCO_HEADSET | - AudioSystem::DEVICE_OUT_BLUETOOTH_SCO_CARKIT))) { + AudioSystem::DEVICE_OUT_BLUETOOTH_SCO_CARKIT | + AudioSystem::DEVICE_IN_BLUETOOTH_SCO_HEADSET))) { return true; } else { return false; |