commit 0b55ec76b08d0eaf57e5354e00f2a9702cae0e91
author kunleiz <kunleiz@codeaurora.org> Thu Nov 10 16:23:58 2016 +0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Thu Nov 24 05:22:29 2016 -0800
tree 9d83dc3f3eb2a18418292df4d3ae491fa4338b61
parent 459d46406e50c4f756213cf5d37eff57464eb104

hal: Fix VoIP ouput is closed if voice+voip concurrency is enabled

In APM, VoIP output would be closed even if Voice+VoIP concurrency
is enabled. This is due to FLAG_DIRECT is set for compress VoIP by
default. While direct output is forced to closed if Voice+Playback
concurrency is disabled.

Fix this by adding proper flag check to avoid VoIP output is
closed.

CRs-Fixed: 1087113
Change-Id: Idbfc1b499a1252f162300f4e1be4d27b44b7e95c

policy_hal/AudioPolicyManager.cpp

diff --git a/policy_hal/AudioPolicyManager.cpp b/policy_hal/AudioPolicyManager.cpp
index 3396054..c8414af 100644
--- a/policy_hal/AudioPolicyManager.cpp
+++ b/policy_hal/AudioPolicyManager.cpp
@@ -843,8 +843,14 @@
                     closeOutput(mOutputs.keyAt(i));
                 }
             } else if (AUDIO_OUTPUT_FLAG_DEEP_BUFFER == mFallBackflag) {
-                if ((outputDesc->mProfile->mFlags & AUDIO_OUTPUT_FLAG_DIRECT)
-                                &&  prop_playback_enabled) {
+                if (outputDesc->mProfile->mFlags & AUDIO_OUTPUT_FLAG_VOIP_RX) {
+                    if (prop_voip_enabled) {
+                        ALOGD("voice_conc:calling closeOutput on call mode for DIRECT  output");
+                        closeOutput(mOutputs.keyAt(i));
+                    }
+                }
+                else if (prop_playback_enabled
+                           && (outputDesc->mProfile->mFlags & AUDIO_OUTPUT_FLAG_DIRECT)) {
                     ALOGD("voice_conc:calling closeOutput on call mode for COMPRESS output");
                     closeOutput(mOutputs.keyAt(i));
                 }