commit 0a04c556947e4fb8e12cd73b9aded27318002336
author Rom Lemarchand <romlem@android.com> Thu Apr 24 22:18:39 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Apr 24 22:18:39 2014 +0000
tree 55d9de41aefbb8c5a3ab18d3129f5ee2cea83c27
parent b1bcd9c3ae89f9060fcd8468d5a04f3710e2b1a6
parent 19759a08053e18bc8efc4aa73f9a0cb8a88608fb

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

* commit '19759a08053e18bc8efc4aa73f9a0cb8a88608fb':
  audio: fix audio_is_bluetooth_sco_device()

include/system/audio.h

diff --git a/include/system/audio.h b/include/system/audio.h
index aa7ac02..f36befb 100644
--- a/include/system/audio.h
+++ b/include/system/audio.h
@@ -471,12 +471,16 @@
 
 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)