commit 5e742388a852fb6b31a311b908b8fe4a890048d7
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Fri May 03 22:24:41 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri May 03 22:24:41 2024 +0000
tree 19d530642243de9b1aa0eceecb9ca2ade0c2c29d
parent 0bc77fbaf0819a692163af36250ef1fc59eeecf0
parent 03b0a0034dfba7d4b93eca1b5638eb1e01a74eb7

Merge "libaudiohal@aidl: Change the criteria for patch matching" into main

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

diff --git a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
index d427de4..5c4ab7b 100644
--- a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
+++ b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
@@ -6397,6 +6397,15 @@
         if ((desc->mFlags & AUDIO_OUTPUT_FLAG_SPATIALIZER) != 0
                 && !isOutputOnlyAvailableRouteToSomeDevice(desc)) {
             outputsClosed.push_back(desc->mIoHandle);
+            nextAudioPortGeneration();
+            ssize_t index = mAudioPatches.indexOfKey(desc->getPatchHandle());
+            if (index >= 0) {
+                sp<AudioPatch> patchDesc = mAudioPatches.valueAt(index);
+                (void) /*status_t status*/ mpClientInterface->releaseAudioPatch(
+                            patchDesc->getAfHandle(), 0);
+                mAudioPatches.removeItemsAt(index);
+                mpClientInterface->onAudioPatchListUpdate();
+            }
             desc->close();
         }
     }