commit d6a9e0c6929a032a22e2b61e1bef770e52be0b06
author kunleiz <kunleiz@codeaurora.org> Mon Jul 30 15:38:52 2018 +0800
committer kunleiz <kunleiz@codeaurora.org> Mon Jul 30 15:39:34 2018 +0800
tree f6b5c4269d05ad92c7697a62c8e88e47b14f8122
parent 6ad124563d2d8c01f6822a1c5b2291fbd5233809

hal: check for usb card state before setting in/out device

During record, audio record usecase still uses usb-headset-mic
as input device even if usb-headset is plugged out. It causes
record fail and mute issue happen.

Fix it by adding check for USB card state, and routing input
device to handset, output device to speaker when usb card is
not existed.

CRs-Fixed: 2264971
Change-Id: Ibfe43c4795a76bf386ab9008a632ef07aa1c7f28

hal/audio_hw.c

diff --git a/hal/audio_hw.c b/hal/audio_hw.c
index fa36879..c2a02b4 100644
--- a/hal/audio_hw.c
+++ b/hal/audio_hw.c
@@ -5719,6 +5719,13 @@
                       (devices != AUDIO_DEVICE_OUT_USB_ACCESSORY);
     bool direct_dev = is_hdmi || is_usb_dev;
 
+    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)",
+              __func__, devices);
+    }
+
     *stream_out = NULL;
 
     out = (struct stream_out *)calloc(1, sizeof(struct stream_out));
@@ -5771,14 +5778,6 @@
            ALOGV("AUDIO_DEVICE_OUT_AUX_DIGITAL and DIRECT|OFFLOAD, check hdmi caps");
            ret = read_hdmi_sink_caps(out);
        } else if (is_usb_dev) {
-            /* Check against usb headset connection state */
-            if (!audio_extn_usb_connected(NULL)) {
-                ALOGD("%s: usb headset unplugged", __func__);
-                ret = -EINVAL;
-                pthread_mutex_unlock(&adev->lock);
-                goto error_open;
-            }
-
             ret = read_usb_sup_params_and_compare(true /*is_playback*/,
                                                   &config->format,
                                                   &out->supported_formats[0],
@@ -6850,6 +6849,13 @@
                                                             flags,
                                                             source);
 
+    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)",
+              __func__, devices);
+    }
+
     *stream_in = NULL;
 
     if (!(is_usb_dev && may_use_hifi_record)) {
@@ -6913,16 +6919,6 @@
     }
 
     if (is_usb_dev && may_use_hifi_record) {
-        /* Check against usb headset connection state */
-        pthread_mutex_lock(&adev->lock);
-        if (!audio_extn_usb_connected(NULL)) {
-            ALOGD("%s: usb headset unplugged", __func__);
-            ret = -EINVAL;
-            pthread_mutex_unlock(&adev->lock);
-            goto err_open;
-        }
-        pthread_mutex_unlock(&adev->lock);
-
         /* HiFi record selects an appropriate format, channel, rate combo
            depending on sink capabilities*/
         ret = read_usb_sup_params_and_compare(false /*is_playback*/,