commit 101dd5ab53a2d3b64d3fac823fe47dd6f1702396
author android-build-team Robot <android-build-team-robot@google.com> Wed Sep 06 07:30:07 2017 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Wed Sep 06 07:30:07 2017 +0000
tree 331194559beeedae34cdd4fc0dec0372996c3cc4
parent a2234a701caa84176b0112e6fbbc98c30f1191f4
parent 1e1ebbf3ec5f7d288579c2e1ae7a9df582e4188c

release-request-ee600ee1-fadc-4a92-9feb-e22548c84a75-for-git_oc-mr1-release-4318546 snap-temp-L23800000099760172

Change-Id: I724676ede713885c1770e5a884e13f735273d7f7

hal/audio_hw.c

diff --git a/hal/audio_hw.c b/hal/audio_hw.c
index ad5d1f1..c27042e 100644
--- a/hal/audio_hw.c
+++ b/hal/audio_hw.c
@@ -1206,13 +1206,20 @@
             usecase->devices = usecase->stream.out->devices;
             in_snd_device = SND_DEVICE_NONE;
             if (out_snd_device == SND_DEVICE_NONE) {
+                struct stream_out *voip_out = adev->primary_output;
+                struct audio_usecase *voip_usecase = get_usecase_from_list(adev,
+                                                         USECASE_AUDIO_PLAYBACK_VOIP);
+
                 out_snd_device = platform_get_output_snd_device(adev->platform,
                                             usecase->stream.out->devices);
-                if (usecase->stream.out == adev->primary_output &&
+
+                if (voip_usecase)
+                    voip_out = voip_usecase->stream.out;
+
+                if (usecase->stream.out == voip_out &&
                         adev->active_input &&
                         (adev->active_input->source == AUDIO_SOURCE_VOICE_COMMUNICATION ||
-                            adev->mode == AUDIO_MODE_IN_COMMUNICATION) &&
-                        out_snd_device != usecase->out_snd_device) {
+                            adev->mode == AUDIO_MODE_IN_COMMUNICATION)) {
                     select_devices(adev, adev->active_input->usecase);
                 }
             }
@@ -1224,9 +1231,15 @@
                 if (adev->active_input &&
                         (adev->active_input->source == AUDIO_SOURCE_VOICE_COMMUNICATION ||
                             adev->mode == AUDIO_MODE_IN_COMMUNICATION)) {
+
+                    struct audio_usecase *voip_usecase = get_usecase_from_list(adev,
+                                                             USECASE_AUDIO_PLAYBACK_VOIP);
+
                     platform_set_echo_reference(adev, false, AUDIO_DEVICE_NONE);
                     if (usecase->id == USECASE_AUDIO_RECORD_AFE_PROXY) {
                         out_device = AUDIO_DEVICE_OUT_TELEPHONY_TX;
+                    } else if (voip_usecase) {
+                        out_device = voip_usecase->stream.out->devices;
                     } else if (adev->primary_output) {
                         out_device = adev->primary_output->devices;
                     }