commit e7d13b373dd55172bbaca0ab2d268263445c0d8e
author Linux Build Service Account <lnxbuild@localhost> Tue Aug 21 11:07:29 2018 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Tue Aug 21 11:07:29 2018 -0700
tree 6db2c0ec388b5eb26b5c2fff87eb6fc56c9024d0
parent 01cc04f1a835ef18d13baee55e2986fa55dfd6b7
parent 0118daaf28b8cdfb8e3648a4c27ec08ae8dffc97

Merge "policy: update voice volume after output device is changed."

policy_hal/AudioPolicyManager.cpp

diff --git a/policy_hal/AudioPolicyManager.cpp b/policy_hal/AudioPolicyManager.cpp
index 27f6a40..6bc3d1e 100644
--- a/policy_hal/AudioPolicyManager.cpp
+++ b/policy_hal/AudioPolicyManager.cpp
@@ -1541,8 +1541,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;
              }
         }