diff options
| author | Misael Lopez Cruz <misael.lopez@ti.com> | 2015-04-29 12:02:08 -0500 |
|---|---|---|
| committer | Jean-Michel Trivi <jmtrivi@google.com> | 2015-05-12 15:28:23 -0700 |
| commit | 794857a8a1800e515d61970363c405db5359c2aa (patch) | |
| tree | 709b44abed622bdb7c3f2b716ed67209be1ac4d1 /audio/include | |
| parent | a6a53c679f514b3f7357cdbd0e39fa1f148daef1 (diff) | |
| download | android_system_media-794857a8a1800e515d61970363c405db5359c2aa.tar.gz android_system_media-794857a8a1800e515d61970363c405db5359c2aa.tar.bz2 android_system_media-794857a8a1800e515d61970363c405db5359c2aa.zip | |
audio: Fix false positives in audio_is_remote_submix_device()
The audio_is_remote_submix_device() helper function incorrectly
reported AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_HEADPHONES and
AUDIO_DEVICE_IN_LINE as a submix devices.
The cases where the confusion occurs are for devices whose bitwise
value only differs in the direction bit.
Change-Id: I3bb9fd1158a26a8f4b3b59246974e703ca5ba0f0
Signed-off-by: Misael Lopez Cruz <misael.lopez@ti.com>
Diffstat (limited to 'audio/include')
| -rw-r--r-- | audio/include/system/audio.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/audio/include/system/audio.h b/audio/include/system/audio.h index b50c6400..09e80cc6 100644 --- a/audio/include/system/audio.h +++ b/audio/include/system/audio.h @@ -1126,8 +1126,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; |