commit 5a756fb0f1f3f8cd7612284c889dfc69875577a8
author Eric Laurent <elaurent@google.com> Thu Dec 16 11:18:29 2010 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Thu Dec 16 11:18:29 2010 -0800
tree 6a4a1c136c7df5d28c1e7e344c2cd4b3cdda8b81
parent 3165bbb15560ed9facdfb906da55a9b24eb5989a
parent 36d41b8103a525a9a581c01740428ec9f9c782a2

Merge "Fix issue 2712130: Sholes: problem when playing audio while recording over bluetooth SCO." into gingerbread

media/libmedia/AudioSystem.cpp

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 @@
     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;