diff options
| author | Eric Laurent <elaurent@google.com> | 2010-12-16 11:18:29 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-12-16 11:18:29 -0800 |
| commit | 5a756fb0f1f3f8cd7612284c889dfc69875577a8 (patch) | |
| tree | 6a4a1c136c7df5d28c1e7e344c2cd4b3cdda8b81 | |
| parent | 3165bbb15560ed9facdfb906da55a9b24eb5989a (diff) | |
| parent | 36d41b8103a525a9a581c01740428ec9f9c782a2 (diff) | |
| download | frameworks_base-5a756fb0f1f3f8cd7612284c889dfc69875577a8.zip frameworks_base-5a756fb0f1f3f8cd7612284c889dfc69875577a8.tar.gz frameworks_base-5a756fb0f1f3f8cd7612284c889dfc69875577a8.tar.bz2 | |
Merge "Fix issue 2712130: Sholes: problem when playing audio while recording over bluetooth SCO." into gingerbread
| -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; |