openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

am 19759a08: Merge "audio: fix audio_is_bluetooth_sco_device()" 

* commit '19759a08053e18bc8efc4aa73f9a0cb8a88608fb':
  audio: fix audio_is_bluetooth_sco_device()
This commit is contained in:
Rom Lemarchand 2014-04-24 22:18:39 +00:00 committed by Android Git Automerger
parent b1bcd9c3ae 19759a0805
commit 0a04c55694
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
include/system/audio.h
View File

@ -471,12 +471,16 @@ static inline bool audio_is_a2dp_device(audio_devices_t device)
static inline bool audio_is_bluetooth_sco_device(audio_devices_t device)
{
device &= ~AUDIO_DEVICE_BIT_IN;
if ((popcount(device) == 1) && (device & (AUDIO_DEVICE_OUT_ALL_SCO |
AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET)))
return true;
else
return false;
if ((device & AUDIO_DEVICE_BIT_IN) == 0) {
if ((popcount(device) == 1) && ((device & ~AUDIO_DEVICE_OUT_ALL_SCO) == 0))
return true;
} else {
device &= ~AUDIO_DEVICE_BIT_IN;
if ((popcount(device) == 1) && ((device & ~AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET) == 0))
return true;
}
return false;
}
static inline bool audio_is_usb_device(audio_devices_t device)