commit 7a6d9e0dcbd2a895e8ceccf05d069011225e509a
author kunleiz <kunleiz@codeaurora.org> Mon Jul 30 15:38:52 2018 +0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Tue Aug 14 20:11:47 2018 -0700
tree 2d9129c3fe10c3f25a66bbcdebe92ae84da39310
parent f0877a9e46b94763f3a12a60b8bfe22af50be44a

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 16ac7f4..1fc0f68 100644
--- a/hal/audio_hw.c
+++ b/hal/audio_hw.c
@@ -5687,6 +5687,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));
@@ -6788,6 +6795,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)) {