diff options
| author | Eric Laurent <elaurent@google.com> | 2010-05-26 22:47:50 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-05-26 22:47:50 -0700 |
| commit | c82f4519e047c702fd0c6f40514ed3834f3fafa3 (patch) | |
| tree | b5920bb3b487b6f8cd1d163494499e8c5f995496 /media/libmedia | |
| parent | 4e49bb98905ad74daddc023831213d8e47fdf2f1 (diff) | |
| parent | c6ea35372854521ea059eccaba5958a920228959 (diff) | |
| download | frameworks_base-c82f4519e047c702fd0c6f40514ed3834f3fafa3.zip frameworks_base-c82f4519e047c702fd0c6f40514ed3834f3fafa3.tar.gz frameworks_base-c82f4519e047c702fd0c6f40514ed3834f3fafa3.tar.bz2 | |
Merge "Fix issue 2712130: Sholes: problem when playing audio while recording over bluetooth SCO."
Diffstat (limited to 'media/libmedia')
| -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 5e6ce42..4478abd 100644 --- a/media/libmedia/AudioSystem.cpp +++ b/media/libmedia/AudioSystem.cpp @@ -721,7 +721,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; |