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 | a47e14e20e2c97955ac116b4f229316fe9c88e53 (patch) | |
| tree | 5a8e228ab6aed3e40aecc2b6f8efabf7459f89e3 /media/libmedia | |
| parent | 3415c34b3a3224d042761d646ef0bdd7e8af0a1b (diff) | |
| parent | 2dadcda205d995f7094b7569b076921872505143 (diff) | |
| download | frameworks_av-a47e14e20e2c97955ac116b4f229316fe9c88e53.zip frameworks_av-a47e14e20e2c97955ac116b4f229316fe9c88e53.tar.gz frameworks_av-a47e14e20e2c97955ac116b4f229316fe9c88e53.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; |