commit ab4be108871ea2ebb5381544a515fa29ff66f67b
author qctecmdr <qctecmdr@localhost> Tue Nov 10 22:41:22 2020 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Tue Nov 10 22:41:22 2020 -0800
tree 6705fbaa5793405146b299154fc30d396edfc3ac
parent 3fc91a3a3d062e23bf7872714ac3ea49b8f055fe
parent 7ca8b2a9dce984d3e71e72f17fd0cad308f3bc43

Merge "hal: ext_hw_plugin: Fix missing break statement in check usecase"

configs/lahaina/audio_platform_info_hdk.xml

diff --git a/configs/lahaina/audio_platform_info_hdk.xml b/configs/lahaina/audio_platform_info_hdk.xml
index a5b0e17..0a34ae2 100644
--- a/configs/lahaina/audio_platform_info_hdk.xml
+++ b/configs/lahaina/audio_platform_info_hdk.xml
@@ -123,13 +123,13 @@
         <gain_level_map db="0" level="1"/>
     </gain_db_to_level_mapping>
     <acdb_ids>
-        <device name="SND_DEVICE_OUT_SPEAKER" acdb_id="15"/>
+        <device name="SND_DEVICE_OUT_SPEAKER" acdb_id="14"/>
         <device name="SND_DEVICE_OUT_SPEAKER_REVERSE" acdb_id="15"/>
-        <device name="SND_DEVICE_OUT_SPEAKER_PROTECTED" acdb_id="124"/>
+        <device name="SND_DEVICE_OUT_SPEAKER_PROTECTED" acdb_id="101"/>
         <device name="SND_DEVICE_OUT_VOICE_SPEAKER_PROTECTED" acdb_id="101"/>
-        <device name="SND_DEVICE_OUT_SPEAKER_PROTECTED_VBAT" acdb_id="124"/>
+        <device name="SND_DEVICE_OUT_SPEAKER_PROTECTED_VBAT" acdb_id="101"/>
         <device name="SND_DEVICE_OUT_VOICE_SPEAKER_PROTECTED_VBAT" acdb_id="101"/>
-        <device name="SND_DEVICE_IN_CAPTURE_VI_FEEDBACK" acdb_id="102"/>
+        <device name="SND_DEVICE_IN_CAPTURE_VI_FEEDBACK" acdb_id="151"/>
         <device name="SND_DEVICE_OUT_VOICE_SPEAKER_2_PROTECTED" acdb_id="150"/>
         <device name="SND_DEVICE_OUT_VOICE_SPEAKER_2_PROTECTED_VBAT" acdb_id="150"/>
         <device name="SND_DEVICE_IN_CAPTURE_VI_FEEDBACK_MONO_1" acdb_id="151"/>

hal/audio_hw.c

diff --git a/hal/audio_hw.c b/hal/audio_hw.c
index d2d4298..8e4f9e1 100755
--- a/hal/audio_hw.c
+++ b/hal/audio_hw.c
@@ -962,6 +962,8 @@
                     disable_audio_route(adev, usecase);
                     disable_snd_device(adev, usecase->out_snd_device);
                     usecase->stream.out->sample_rate = DEFAULT_OUTPUT_SAMPLING_RATE;
+                    platform_check_and_set_codec_backend_cfg(adev, usecase,
+                                                            usecase->out_snd_device);
                     enable_audio_route(adev, usecase);
                     enable_snd_device(adev, usecase->out_snd_device);
                 }