commit 888f4bee2ac66f7266a3ee82d596242e5c2c7090
author Linux Build Service Account <lnxbuild@localhost> Thu Jul 26 21:22:03 2018 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Thu Jul 26 21:22:03 2018 -0700
tree 67959d42abf55e36ae8063fd7ee303fc1b5e3bb1
parent b4384d7b3bd889da621427b83d09a8f2f0139772
parent e5c697c093712cd642abdd7bd48f19cd91a7a069

Merge "hal: add support for incall music uplink usecase"

configs/msmnile/mixer_paths_tavil.xml

diff --git a/configs/msmnile/mixer_paths_tavil.xml b/configs/msmnile/mixer_paths_tavil.xml
old mode 100755
new mode 100644
index f699f73..0149d92
--- a/configs/msmnile/mixer_paths_tavil.xml
+++ b/configs/msmnile/mixer_paths_tavil.xml
@@ -1938,6 +1938,14 @@
         <ctl name="SLIM0_RX_VI_FB_RCH_MUX" value="SLIM4_TX" />
     </path>
 
+    <path name="speaker-protected-qrd">
+        <ctl name="AIF4_VI Mixer SPKR_VI_2" value="1" />
+        <ctl name="SLIM_4_TX Format" value="PACKED_16B" />
+        <path name="speaker-qrd" />
+        <ctl name="VI_FEED_TX Channels" value="One" />
+        <ctl name="SLIM0_RX_VI_FB_LCH_MUX" value="SLIM4_TX" />
+    </path>
+
     <path name="voice-speaker-protected">
         <ctl name="AIF4_VI Mixer SPKR_VI_1" value="1" />
         <ctl name="SLIM_4_TX Format" value="PACKED_16B" />
@@ -1946,6 +1954,10 @@
         <ctl name="SLIM0_RX_VI_FB_LCH_MUX" value="SLIM4_TX" />
     </path>
 
+    <path name="voice-speaker-protected-qrd">
+        <path name="speaker-protected-qrd" />
+    </path>
+
     <path name="voice-speaker-stereo-protected">
         <path name="speaker-protected" />
     </path>

configs/msmnile/msmnile.mk

diff --git a/configs/msmnile/msmnile.mk b/configs/msmnile/msmnile.mk
index d6655ce..ba39176 100644
--- a/configs/msmnile/msmnile.mk
+++ b/configs/msmnile/msmnile.mk
@@ -32,7 +32,7 @@
 AUDIO_FEATURE_ENABLED_AUDIOSPHERE := true
 AUDIO_FEATURE_ENABLED_USB_TUNNEL_AUDIO := true
 AUDIO_FEATURE_ENABLED_SPLIT_A2DP := true
-AUDIO_FEATURE_ENABLED_3D_AUDIO := false
+AUDIO_FEATURE_ENABLED_3D_AUDIO := true
 DOLBY_ENABLE := false
 endif
 

configs/sdm710/sdm710.mk

diff --git a/configs/sdm710/sdm710.mk b/configs/sdm710/sdm710.mk
index 7dce6af..dc21eb4 100644
--- a/configs/sdm710/sdm710.mk
+++ b/configs/sdm710/sdm710.mk
@@ -33,7 +33,7 @@
 AUDIO_FEATURE_ENABLED_AUDIOSPHERE := true
 AUDIO_FEATURE_ENABLED_USB_TUNNEL_AUDIO := true
 AUDIO_FEATURE_ENABLED_SPLIT_A2DP := true
-AUDIO_FEATURE_ENABLED_3D_AUDIO := false
+AUDIO_FEATURE_ENABLED_3D_AUDIO := true
 AUDIO_FEATURE_ENABLED_VOICE_PRINT := false
 USE_LEGACY_AUDIO_DAEMON := false
 USE_LEGACY_AUDIO_MEASUREMENT := false