commit ae59915122179ee26f56bb3cb50586c0fe8b5e51
author Linux Build Service Account <lnxbuild@localhost> Wed Aug 29 06:52:14 2018 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Wed Aug 29 06:52:14 2018 -0700
tree 75afdb6619345e2bd45bf115b056ac61d2d42f07
parent 55f40f9c358adb5470e56a66710254063a426a20
parent b3fb48ec9e9b6f290b625d9017703d02dbdfa9e3

Merge "hal: use correct usb card state when setting in/out device"

hal/audio_hw.c

diff --git a/hal/audio_hw.c b/hal/audio_hw.c
index a384b9b..c208298 100644
--- a/hal/audio_hw.c
+++ b/hal/audio_hw.c
@@ -5687,7 +5687,7 @@
                       (devices != AUDIO_DEVICE_OUT_USB_ACCESSORY);
     bool direct_dev = is_hdmi || is_usb_dev;
 
-    if (is_usb_dev && (audio_extn_usb_connected(NULL))) {
+    if (is_usb_dev && (!audio_extn_usb_connected(NULL))) {
         is_usb_dev = false;
         devices = AUDIO_DEVICE_OUT_SPEAKER;
         ALOGW("%s: ignore set device to non existing USB card, use output device(%#x)",
@@ -6795,7 +6795,7 @@
                                                             flags,
                                                             source);
 
-    if (is_usb_dev && (audio_extn_usb_connected(NULL))) {
+    if (is_usb_dev && (!audio_extn_usb_connected(NULL))) {
         is_usb_dev = false;
         devices = AUDIO_DEVICE_IN_BUILTIN_MIC;
         ALOGW("%s: ignore set device to non existing USB card, use input device(%#x)",