commit bd442a74ecd6a03fb623d32fcac47a5ff85789be
author Jeff Brown <jeffbrown@google.com> Mon Aug 19 17:01:27 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Aug 19 17:01:27 2013 -0700
tree 265eb2ad5b22b0ba138195b818b8ebf8353f4354
parent 3c0eef67f7e6385710d69bda40e50b23fa91c081
parent c7a4f74dad2b91bebad608618f3fda434563be74

am c7a4f74d: Merge "Add helpers for audio remote submix devices." into klp-dev

* commit 'c7a4f74dad2b91bebad608618f3fda434563be74':
  Add helpers for audio remote submix devices.

include/system/audio.h

diff --git a/include/system/audio.h b/include/system/audio.h
index abd2990..b90f4a9 100644
--- a/include/system/audio.h
+++ b/include/system/audio.h
@@ -31,6 +31,9 @@
  * frameworks/base/include/media/AudioSystem.h
  */
 
+/* device address used to refer to the standard remote submix */
+#define AUDIO_REMOTE_SUBMIX_DEVICE_ADDRESS "0"
+
 typedef int audio_io_handle_t;
 
 /* Audio stream types */
@@ -481,7 +484,8 @@
 
 static inline bool audio_is_remote_submix_device(audio_devices_t device)
 {
-    if ((popcount(device) == 1) && (device & AUDIO_DEVICE_OUT_REMOTE_SUBMIX))
+    if ((device & AUDIO_DEVICE_OUT_REMOTE_SUBMIX) == AUDIO_DEVICE_OUT_REMOTE_SUBMIX
+            || (device & AUDIO_DEVICE_IN_REMOTE_SUBMIX) == AUDIO_DEVICE_IN_REMOTE_SUBMIX)
         return true;
     else
         return false;