commit ac1de01dc03618f12eee6e3b9bfc897839059b08
author Linux Build Service Account <lnxbuild@localhost> Thu Feb 09 03:12:56 2017 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Thu Feb 09 03:12:56 2017 -0800
tree f09bc412fc4c69d4d7bd100a30bf1b3d502fce59
parent ad9d7720f777231d934ee21c0af84480b6fe0834
parent 6c3d09916ca67ed7418983ee6841d6f6a08aa05d

Merge "hal: Fix Rx/Tx mute during HFP call" into audio-userspace.lnx.2.2-dev

hal/audio_hw.c

diff --git a/hal/audio_hw.c b/hal/audio_hw.c
index dc933d3..9d62533 100644
--- a/hal/audio_hw.c
+++ b/hal/audio_hw.c
@@ -4314,6 +4314,9 @@
     if (adev->voice_tx_output == out)
         adev->voice_tx_output = NULL;
 
+    if (adev->primary_output == out)
+        adev->primary_output = NULL;
+
     pthread_cond_destroy(&out->cond);
     pthread_mutex_destroy(&out->lock);
     free(stream);