commit 18bdec0fc9c0cfdb294c430e762e927f7d0c2057
author kunleiz <kunleiz@codeaurora.org> Tue Aug 07 17:09:11 2018 +0800
committer kunleiz <kunleiz@codeaurora.org> Tue Oct 16 18:45:01 2018 +0800
tree 8501f695d549a7de9229a780e2b064cd23aa8da1
parent 7422d5f38d7783f6973b0c2c181bce4c1bfccf95

hal: ensure voip tx update base on the rx path

Voip does not use primary output in rx path. When voip
rx device change, voip tx path is not updated accordingly.

Fix it by selecting voip tx device base on the rx path,
otherwise base on primary output device.

And add primary output validity check during voip device switch.
Change-Id: I6380cb422f847d9c778a411628d95792cee23d18

CRs-Fixed: 2289517
Change-Id: Ic078eb057be40dd4338ade70f541bb056c19dfca

hal/msm8974/platform.c

diff --git a/hal/msm8974/platform.c b/hal/msm8974/platform.c
index 0400169..0766311 100644
--- a/hal/msm8974/platform.c
+++ b/hal/msm8974/platform.c
@@ -4549,6 +4549,16 @@
               (mode == AUDIO_MODE_IN_COMMUNICATION)) {
         if (out_device & AUDIO_DEVICE_OUT_SPEAKER)
             in_device = AUDIO_DEVICE_IN_BACK_MIC;
+        else if (out_device & AUDIO_DEVICE_OUT_EARPIECE)
+            in_device = AUDIO_DEVICE_IN_BUILTIN_MIC;
+        else if (out_device & AUDIO_DEVICE_OUT_WIRED_HEADSET)
+            in_device = AUDIO_DEVICE_IN_WIRED_HEADSET;
+        else if (out_device & AUDIO_DEVICE_OUT_USB_DEVICE)
+            in_device = AUDIO_DEVICE_IN_USB_DEVICE;
+
+        in_device = ((out_device == AUDIO_DEVICE_NONE) ?
+                      AUDIO_DEVICE_IN_BUILTIN_MIC : in_device) & ~AUDIO_DEVICE_BIT_IN;
+
         if (adev->active_input) {
             snd_device = get_snd_device_for_voice_comm(my_data, out_device, in_device);
         }