commit 435b27b0acd479f0ccb3063829deb1d0b160260a
author Linux Build Service Account <lnxbuild@localhost> Thu Sep 08 05:01:40 2016 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Thu Sep 08 05:01:40 2016 -0700
tree f2f53af13a3e67c53634286db8251615e1c4277d
parent 03c9fb1169544ef598e88470f2ffab06623d576c
parent 86ca17de5b96433da2b0cc4e0cdfec42a3ff1b3d

Merge "hal: refine conditional logic when device connected/disconnected" into audio-userspace.lnx.2.1-dev

hal/audio_hw.c

diff --git a/hal/audio_hw.c b/hal/audio_hw.c
index 7d3c824..43c83de 100644
--- a/hal/audio_hw.c
+++ b/hal/audio_hw.c
@@ -4109,7 +4109,7 @@
             ALOGV("cache new edid");
             platform_cache_edid(adev->platform);
         } else if ((val & AUDIO_DEVICE_OUT_USB_DEVICE) ||
-                   (val & AUDIO_DEVICE_IN_USB_DEVICE)) {
+                   !(val ^ AUDIO_DEVICE_IN_USB_DEVICE)) {
             /*
              * Do not allow AFE proxy port usage by WFD source when USB headset is connected.
              * Per AudioPolicyManager, USB device is higher priority than WFD.
@@ -4133,7 +4133,7 @@
             ALOGV("invalidate cached edid");
             platform_invalidate_hdmi_config(adev->platform);
         } else if ((val & AUDIO_DEVICE_OUT_USB_DEVICE) ||
-                   (val & AUDIO_DEVICE_IN_USB_DEVICE)) {
+                   !(val ^ AUDIO_DEVICE_IN_USB_DEVICE)) {
             ret = str_parms_get_str(parms, "card", value, sizeof(value));
             if (ret >= 0) {
                 audio_extn_usb_remove_device(val, atoi(value));