commit 1879875f416249cf6a7b9a0155de578267b797e7
author Linux Build Service Account <lnxbuild@localhost> Tue Oct 23 04:28:01 2018 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Tue Oct 23 04:28:01 2018 -0700
tree b33a7f775bfd0475d00f6a6d38db818b9779ddca
parent aa1e94bc2f6e4b3be63e7fbff8a338e769a319ee
parent 3ca773fb6b9411ea6b94f8191848600bca7a73be

Merge "hal: add primary output validity check during voip device switch"

hal/audio_hw.c

diff --git a/hal/audio_hw.c b/hal/audio_hw.c
index 3e3f72f..8d6ef64 100644
--- a/hal/audio_hw.c
+++ b/hal/audio_hw.c
@@ -2146,13 +2146,14 @@
                 out_snd_device = platform_get_output_snd_device(adev->platform,
                                             usecase->stream.out);
                 voip_usecase = get_usecase_from_list(adev, USECASE_AUDIO_PLAYBACK_VOIP);
-                if (voip_usecase == NULL)
+                if (voip_usecase == NULL && adev->primary_output && !adev->primary_output->standby)
                     voip_usecase = get_usecase_from_list(adev, adev->primary_output->usecase);
 
                 if ((usecase->stream.out != NULL &&
                      voip_usecase != NULL &&
                      usecase->stream.out->usecase == voip_usecase->id) &&
                     adev->active_input &&
+                    adev->active_input->source == AUDIO_SOURCE_VOICE_COMMUNICATION &&
                     out_snd_device != usecase->out_snd_device) {
                     select_devices(adev, adev->active_input->usecase);
                 }