commit ef352d39c05862d8c9e8e64ba11f84e5401ffd4d
author qctecmdr <qctecmdr@localhost> Thu Oct 08 22:55:43 2020 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Thu Oct 08 22:55:43 2020 -0700
tree 5eb44520b13c84bae7530745a1100a0bc4f69529
parent 153d450a1a52db9da3ac0454032b3993c80d1723
parent 4a832da3779f5cad6327e22168c474eadaf65e3e

Merge "policy_hal: avoid VOIP_RX flag is removed for voip call"

policy_hal/AudioPolicyManager.cpp

diff --git a/policy_hal/AudioPolicyManager.cpp b/policy_hal/AudioPolicyManager.cpp
index 39cb42e..95c9bd3 100644
--- a/policy_hal/AudioPolicyManager.cpp
+++ b/policy_hal/AudioPolicyManager.cpp
@@ -1701,7 +1701,8 @@
         // prevent direct pcm for non-music stream blindly if direct pcm already in use
         // for other music stream concurrency is handled after checking direct ouput usage
         // and checking client
-        if (direct_pcm_already_in_use == true && stream != AUDIO_STREAM_MUSIC) {
+        if (direct_pcm_already_in_use == true && stream != AUDIO_STREAM_MUSIC &&
+            !(*flags & AUDIO_OUTPUT_FLAG_VOIP_RX)) {
             ALOGD("disabling offload for non music stream as direct pcm is already in use");
             *flags = (audio_output_flags_t)(AUDIO_OUTPUT_FLAG_NONE);
         }