commit 20798a9d2a9e06048ba46d454bff4f0c62fba359
author Linux Build Service Account <lnxbuild@localhost> Wed Mar 17 05:03:12 2021 -0700
committer Linux Build Service Account <lnxbuild@localhost> Wed Mar 17 05:03:12 2021 -0700
tree a02c993534a1b6dd183e0961121261877ba97f19
parent e9ec6287e475bcfd4136bf81e8b75f9f3eab794a
parent a5956c72a350ca32cd376f3fe4ac30df604b6bdf

Merge a5956c72a350ca32cd376f3fe4ac30df604b6bdf on remote branch

Change-Id: I30483655ca06c223c0dbac819921bac53e440422

policy_hal/AudioPolicyManager.cpp

diff --git a/policy_hal/AudioPolicyManager.cpp b/policy_hal/AudioPolicyManager.cpp
index 1e7dcf2..f76960e 100644
--- a/policy_hal/AudioPolicyManager.cpp
+++ b/policy_hal/AudioPolicyManager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2020 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2013-2021 The Linux Foundation. All rights reserved.
  * Not a contribution.
  *
  * Copyright (C) 2009 The Android Open Source Project
@@ -1502,7 +1502,8 @@
             }
         } else if ((config->channel_mask == 1 || config->channel_mask == 3) &&
                    (config->sample_rate == 8000 || config->sample_rate == 16000 ||
-                    config->sample_rate == 32000 || config->sample_rate == 48000)) {
+                    config->sample_rate == 32000 || config->sample_rate == 48000) &&
+                   (mEngine->getPhoneState() != AUDIO_MODE_IN_CALL)) {
             *flags = (audio_output_flags_t)(AUDIO_OUTPUT_FLAG_VOIP_RX |
                                                AUDIO_OUTPUT_FLAG_DIRECT);
             ALOGV("Set VoIP and Direct output flags for PCM format");