commit 865775da05ec25f7682b9bcde5015c65d725f6f9
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu Sep 19 17:42:28 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Sep 19 17:42:28 2024 +0000
tree 1516282ae97e654549681795ae8d87d20adac389
parent 1d327f790fd9c6edaef57db853034bfe4826c998
parent fedb92ef9318c652b1331308a34adfe3cf0eba2e

Merge "Invalidate all clients when bit-perfect client is active." into main

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

diff --git a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
index 87b5fd4..574307a 100644
--- a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
+++ b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
@@ -2379,8 +2379,8 @@
                 // the bit-perfect sink so that it is guaranteed only bit-perfect stream is active.
                 PortHandleVector clientsToInvalidate;
                 for (size_t i = 0; i < mOutputs.size(); i++) {
-                    if (mOutputs[i] == outputDesc ||
-                        mOutputs[i]->devices().filter(outputDesc->devices()).isEmpty()) {
+                    if (mOutputs[i] == outputDesc || (!mOutputs[i]->devices().isEmpty() &&
+                        mOutputs[i]->devices().filter(outputDesc->devices()).isEmpty())) {
                         continue;
                     }
                     for (const auto& c : mOutputs[i]->getClientIterable()) {