commit 01cc04f1a835ef18d13baee55e2986fa55dfd6b7
author Linux Build Service Account <lnxbuild@localhost> Tue Aug 14 22:43:51 2018 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Tue Aug 14 22:43:51 2018 -0700
tree 8ef7e16699f4e9ccdcc1c31f96800c21a79b3611
parent 5f1111b3311c0628ddc2c7fed09038612e2791da
parent 45eb20aeac9402d8253c6fef3b5b86d12df7cc75

Merge "policy: close voip output when new output is opened by same voip client"

policy_hal/AudioPolicyManager.cpp

diff --git a/policy_hal/AudioPolicyManager.cpp b/policy_hal/AudioPolicyManager.cpp
index 7a323c9..ab933a0 100644
--- a/policy_hal/AudioPolicyManager.cpp
+++ b/policy_hal/AudioPolicyManager.cpp
@@ -1537,8 +1537,14 @@
         for (size_t i = 0; i < mOutputs.size(); i++) {
              sp<SwAudioOutputDescriptor> desc = mOutputs.valueAt(i);
              if (desc->mFlags == (AUDIO_OUTPUT_FLAG_VOIP_RX | AUDIO_OUTPUT_FLAG_DIRECT)) {
-                 voip_pcm_already_in_use = true;
-                 ALOGD("VoIP PCM already in use");
+                 //close voip output if currently open by the same client with different device
+                 if (desc->mDirectClientSession == session &&
+                     desc->device() != device) {
+                     closeOutput(desc->mIoHandle);
+                 } else {
+                     voip_pcm_already_in_use = true;
+                     ALOGD("VoIP PCM already in use");
+                 }
                  break;
              }
         }