commit 3b3d3c0d5f4a786c2986c6f1523e5dafcb29d6b8
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Sat Aug 24 04:42:40 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Aug 24 04:42:40 2024 +0000
tree 047cb4f43d236cfe0ae492c84d85e18609795ad8
parent 379107fcd2fce186c46f49069784db27af399aca
parent 39217a966cff24f5e90e966e340f7071778942dc

Merge "Revert "Fix audio glitch when starting/stopping HFP call"" into main

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

diff --git a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
index 5907aac..d8ea170 100644
--- a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
+++ b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
@@ -7132,8 +7132,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();
                 }