am 74f0a578: Merge "audio: Fix false positives in audio_is_remote_submix_device()"

* commit '74f0a578a8ee0957b849e811af5fc30c74be55f0':
  audio: Fix false positives in audio_is_remote_submix_device()
This commit is contained in:
Eric Laurent 2015-05-12 22:47:08 +00:00 committed by Android Git Automerger
commit b942d6fbb6

View file

@ -1102,8 +1102,10 @@ static inline bool audio_is_usb_device(audio_devices_t device)
static inline bool audio_is_remote_submix_device(audio_devices_t device)
{
if ((device & AUDIO_DEVICE_OUT_REMOTE_SUBMIX) == AUDIO_DEVICE_OUT_REMOTE_SUBMIX
|| (device & AUDIO_DEVICE_IN_REMOTE_SUBMIX) == AUDIO_DEVICE_IN_REMOTE_SUBMIX)
if ((audio_is_output_devices(device) &&
(device & AUDIO_DEVICE_OUT_REMOTE_SUBMIX) == AUDIO_DEVICE_OUT_REMOTE_SUBMIX)
|| (!audio_is_output_devices(device) &&
(device & AUDIO_DEVICE_IN_REMOTE_SUBMIX) == AUDIO_DEVICE_IN_REMOTE_SUBMIX))
return true;
else
return false;