commit 39217a966cff24f5e90e966e340f7071778942dc
author Daniel Chapin <chapin@google.com> Thu Aug 22 23:05:26 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Aug 22 23:05:26 2024 +0000
tree 7444b2c6f21ac903b06de63ab4527cec46fd6c74
parent 36077c9bc69fd99120cdb82b376ba6f01ff9123f

Revert "Fix audio glitch when starting/stopping HFP call"

This reverts commit 36077c9bc69fd99120cdb82b376ba6f01ff9123f.

Reason for revert: b/361493408

Change-Id: I61f76b9ab00ec76307dd2d9564ecbc1dbbfe031f

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

diff --git a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
index b7201f2..811ca12 100644
--- a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
+++ b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
@@ -7127,8 +7127,7 @@
             if (status != OK) {
                 continue;
             }
-            if ((client->getPrimaryMix() && client->getPrimaryMix() != primaryMix)
-                    || client->hasLostPrimaryMix()) {
+            if (client->getPrimaryMix() != primaryMix || client->hasLostPrimaryMix()) {
                 if (desc->isStrategyActive(psId) && maxLatency < desc->latency()) {
                     maxLatency = desc->latency();
                 }