commit 65852acc2cc77107b960ce561d4da28dab96e48e
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Fri May 03 23:03:04 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri May 03 23:03:04 2024 +0000
tree 5937cb63ddf1e309942e1230412a17850cb851d0
parent c9be946d7db88bdb0122f1d79b1598f40549e9a3
parent 0bc77fbaf0819a692163af36250ef1fc59eeecf0

Merge "audio policy: clean up initial spatializer audio patch" into main am: 0bc77fbaf0

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/3073259

Change-Id: Ic7ce2eb3d3c3a48908a4e67d7d764d0331a691e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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();
         }
     }