Merge "configs: Enable usb offload & support QC ext codec"
diff --git a/configs/msmnile/mixer_paths_tavil.xml b/configs/msmnile/mixer_paths_tavil.xml
index 244382e..a19c667 100644
--- a/configs/msmnile/mixer_paths_tavil.xml
+++ b/configs/msmnile/mixer_paths_tavil.xml
@@ -1506,6 +1506,10 @@
<path name="incall-rec-uplink" />
</path>
+ <path name="incall-rec-uplink headset-mic">
+ <path name="incall-rec-uplink" />
+ </path>
+
<path name="incall-rec-uplink afe-proxy">
<path name="incall-rec-uplink" />
</path>
@@ -1514,6 +1518,10 @@
<ctl name="MultiMedia8 Mixer VOC_REC_UL" value="1" />
</path>
+ <path name="incall-rec-uplink-compress headset-mic">
+ <path name="incall-rec-uplink-compress" />
+ </path>
+
<path name="incall-rec-uplink-compress bt-sco">
<path name="incall-rec-uplink-compress" />
</path>
@@ -1546,6 +1554,10 @@
<path name="incall-rec-downlink" />
</path>
+ <path name="incall-rec-downlink headset-mic">
+ <path name="incall-rec-downlink" />
+ </path>
+
<path name="incall-rec-downlink afe-proxy">
<path name="incall-rec-downlink" />
</path>
@@ -1554,6 +1566,10 @@
<ctl name="MultiMedia8 Mixer VOC_REC_DL" value="1" />
</path>
+ <path name="incall-rec-downlink-compress headset-mic">
+ <path name="incall-rec-downlink-compress" />
+ </path>
+
<path name="incall-rec-downlink-compress bt-sco">
<path name="incall-rec-downlink-compress" />
</path>
@@ -1587,6 +1603,10 @@
<path name="incall-rec-uplink-and-downlink" />
</path>
+ <path name="incall-rec-uplink-and-downlink headset-mic">
+ <path name="incall-rec-uplink-and-downlink" />
+ </path>
+
<path name="incall-rec-uplink-and-downlink afe-proxy">
<path name="incall-rec-uplink-and-downlink" />
</path>
@@ -1600,6 +1620,10 @@
<path name="incall-rec-uplink-and-downlink-compress" />
</path>
+ <path name="incall-rec-uplink-and-downlink-compress headset-mic">
+ <path name="incall-rec-uplink-and-downlink-compress" />
+ </path>
+
<path name="incall-rec-uplink-and-downlink-compress bt-sco-wb">
<path name="incall-rec-uplink-and-downlink-compress" />
</path>
diff --git a/hal/audio_hw.c b/hal/audio_hw.c
index ab99b47..9ec04f9 100644
--- a/hal/audio_hw.c
+++ b/hal/audio_hw.c
@@ -7751,6 +7751,7 @@
struct listnode *node;
struct audio_usecase *usecase = NULL;
int ret = 0;
+
pthread_mutex_lock(&adev->lock);
if (adev->mode != mode) {
ALOGD("%s: mode %d\n", __func__, mode);
@@ -7777,6 +7778,11 @@
voice_stop_call(adev);
platform_set_gsm_mode(adev->platform, false);
adev->current_call_output = NULL;
+ // restore device for other active usecases after stop call
+ list_for_each(node, &adev->usecase_list) {
+ usecase = node_to_item(node, struct audio_usecase, list);
+ select_devices(adev, usecase->id);
+ }
}
}
pthread_mutex_unlock(&adev->lock);