commit 3a13b8da63e15982124bae8219c52dbc4bd467dd
author qctecmdr <qctecmdr@localhost> Thu Jan 21 09:50:37 2021 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Thu Jan 21 09:50:37 2021 -0800
tree 21b5ed2f09c555f2657653c6570ae1a68135af9c
parent a34b3bb8360c5c7b2cc65a0cf591a0a1a95ac3f3
parent ea4fd4206bf316ba6dc50aa48e40d969b4b16567

Merge "hal: Move sequence of audio_extn_auto_hal_open_input_stream"

hal/audio_hw.c

diff --git a/hal/audio_hw.c b/hal/audio_hw.c
index eba044b..12c196d 100644
--- a/hal/audio_hw.c
+++ b/hal/audio_hw.c
@@ -9506,6 +9506,12 @@
             goto err_open;
         }
         ALOGV("%s: car_audio_stream 0x%x", __func__, in->car_audio_stream);
+        ret = audio_extn_auto_hal_open_input_stream(in);
+        if (ret) {
+            ALOGE("%s: Failed to open input stream for bus device", __func__);
+            ret = -EINVAL;
+            goto err_open;
+        }
     }
 
     if (in->source == AUDIO_SOURCE_FM_TUNER) {
@@ -9712,14 +9718,6 @@
                 }
             }
         }
-        if (compare_device_type(&in->device_list, AUDIO_DEVICE_IN_BUS)) {
-           ret = audio_extn_auto_hal_open_input_stream(in);
-           if (ret) {
-               ALOGE("%s: Failed to open input stream for bus device", __func__);
-               ret = -EINVAL;
-               goto err_open;
-           }
-        }
     }
     if (audio_extn_ssr_get_stream() != in)
         in->config.channels = channel_count;