commit 0dcda8464d4f87774fd07aecd1087a31408fbab6
author Eric Laurent <elaurent@google.com> Tue May 12 22:47:08 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue May 12 22:47:08 2015 +0000
tree 658dc3b1bb4bb53a15d7f60e5b3e6c35a94fb32a
parent b3327fae4deb07cf9bc4e2e16d4e1b9527363b81
parent 1384a32f8b02a2adfcb77e51a343328b1fe064df

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()

include/system/audio.h

diff --git a/include/system/audio.h b/include/system/audio.h
index 181a171..8d9ec88 100644
--- a/include/system/audio.h
+++ b/include/system/audio.h
@@ -1102,8 +1102,10 @@
 
 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;