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.
This commit is contained in:
Eric Laurent
2010-12-16 16:05:16 -08:00
committed by Android Git Automerger

View File

@@ -763,7 +763,8 @@ bool AudioSystem::isBluetoothScoDevice(audio_devices device)
if ((popCount(device) == 1 ) && if ((popCount(device) == 1 ) &&
(device & (AudioSystem::DEVICE_OUT_BLUETOOTH_SCO | (device & (AudioSystem::DEVICE_OUT_BLUETOOTH_SCO |
AudioSystem::DEVICE_OUT_BLUETOOTH_SCO_HEADSET | 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; return true;
} else { } else {
return false; return false;