commit f774ff1867c2c0230ae313c2de6f2910f1f04c22
author Linux Build Service Account <lnxbuild@localhost> Fri Apr 20 10:01:17 2018 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Fri Apr 20 10:01:17 2018 -0700
tree b7d4f284a9537f00e4c71bdf7ef8bfb02b18e02e
parent 4c923e4b68a161dfeedf5e7c9c26c91af03e9644
parent b23c7b51f81253fa3040d51c7cc5b107f3eb7d20

Merge "audio: Update missing SPKR and HP combo device usecase path"

configs/msm8953/mixer_paths_mtp.xml

diff --git a/configs/msm8953/mixer_paths_mtp.xml b/configs/msm8953/mixer_paths_mtp.xml
index d20dda4..a7f4e21 100644
--- a/configs/msm8953/mixer_paths_mtp.xml
+++ b/configs/msm8953/mixer_paths_mtp.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
-    Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.
+    Copyright (c) 2015-2016, 2018, The Linux Foundation. All rights reserved.
 
     Redistribution and use in source and binary forms, with or without
     modification, are permitted provided that the following conditions are
@@ -1172,6 +1172,11 @@
         <path name="headphones" />
     </path>
 
+    <path name="voice-speaker-and-voice-headphones">
+        <path name="wsa-voice-speaker" />
+        <path name="voice-headphones" />
+    </path>
+
     <path name="voice-headset-mic">
         <path name="headset-mic" />
     </path>

hal/msm8916/platform.c

diff --git a/hal/msm8916/platform.c b/hal/msm8916/platform.c
index 3b2db9d..27a5c39 100644
--- a/hal/msm8916/platform.c
+++ b/hal/msm8916/platform.c
@@ -794,6 +794,7 @@
     {TO_NAME_INDEX(SND_DEVICE_OUT_VOICE_SPEAKER_2_PROTECTED_VBAT)},
     {TO_NAME_INDEX(SND_DEVICE_OUT_SPEAKER_PROTECTED_RAS)},
     {TO_NAME_INDEX(SND_DEVICE_OUT_SPEAKER_PROTECTED_VBAT_RAS)},
+    {TO_NAME_INDEX(SND_DEVICE_OUT_VOICE_SPEAKER_AND_VOICE_HEADPHONES)},
 #ifdef RECORD_PLAY_CONCURRENCY
     {TO_NAME_INDEX(SND_DEVICE_OUT_VOIP_HANDSET)},
     {TO_NAME_INDEX(SND_DEVICE_OUT_VOIP_SPEAKER)},