configs: msm8937: Remove speaker-safe support for audio policy xml.
-Remove speaker safe support fo sdm429w in audio_policy_configuration.xml
-update a2dp path during speaker-and-bt-a2dp combo device selection
Change-Id: Ifb11118340d23382a2aaa3f4c143d3b00b0103b2
diff --git a/configs/msm8937/audio_policy_configuration_sdm429w.xml b/configs/msm8937/audio_policy_configuration_sdm429w.xml
index b210fbc..33a4af5 100644
--- a/configs/msm8937/audio_policy_configuration_sdm429w.xml
+++ b/configs/msm8937/audio_policy_configuration_sdm429w.xml
@@ -49,7 +49,6 @@
<module name="primary" halVersion="2.0">
<attachedDevices>
<item>Speaker</item>
- <item>Speaker Safe</item>
<item>Earpiece</item>
<item>Telephony Tx</item>
<item>Built-In Mic</item>
@@ -117,8 +116,6 @@
</devicePort>
<devicePort tagName="Speaker" type="AUDIO_DEVICE_OUT_SPEAKER" role="sink">
</devicePort>
- <devicePort tagName="Speaker Safe" type="AUDIO_DEVICE_OUT_SPEAKER_SAFE" role="sink">
- </devicePort>
<devicePort tagName="BT SCO" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO" role="sink">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
samplingRates="8000,16000" channelMasks="AUDIO_CHANNEL_OUT_MONO"/>
@@ -163,8 +160,6 @@
sources="primary output,raw,deep_buffer"/>
<route type="mix" sink="Speaker"
sources="primary output,raw,deep_buffer,compressed_offload"/>
- <route type="mix" sink="Speaker Safe"
- sources="primary output,raw,deep_buffer,compressed_offload"/>
<route type="mix" sink="BT SCO"
sources="primary output,raw,deep_buffer,voip_rx"/>
<route type="mix" sink="BT SCO Headset"
diff --git a/configs/msm8937/mixer_paths_sdm429w_dvt2.xml b/configs/msm8937/mixer_paths_sdm429w_dvt2.xml
index 4a6d124..aea01f4 100644
--- a/configs/msm8937/mixer_paths_sdm429w_dvt2.xml
+++ b/configs/msm8937/mixer_paths_sdm429w_dvt2.xml
@@ -935,6 +935,7 @@
<path name="speaker-and-bt-a2dp">
<path name="speaker" />
+ <path name="bt-a2dp" />
</path>
<path name="voice-rec-mic">