commit 0666cc5b6b430cc5a815dab0bcba3dd73da8061a
author Eric Laurent <elaurent@google.com> Tue Dec 15 10:14:06 2015 -0800
committer Eric Laurent <elaurent@google.com> Wed May 25 08:42:19 2016 -0700
tree 38cae5fe4c86705889a0e80547d3cdb73d67d0cd
parent f0f4f1e494a80ce300a68cfce0e1dc627c09c29a

audio flinger: fix audio patch release

Release playback and capture threads associated to a softwware
audio patch when the patch handle is reused.

Bug: 25638953.
Change-Id: Ie832513043525dda9089f8e83018810add2a4d6e

services/audioflinger/PatchPanel.cpp

diff --git a/services/audioflinger/PatchPanel.cpp b/services/audioflinger/PatchPanel.cpp
index 89de68e..f8671b5 100644
--- a/services/audioflinger/PatchPanel.cpp
+++ b/services/audioflinger/PatchPanel.cpp
@@ -168,6 +168,12 @@
                 ALOGV("createAudioPatch() removing patch handle %d", *handle);
                 halHandle = mPatches[index]->mHalHandle;
                 Patch *removedPatch = mPatches[index];
+                if ((removedPatch->mRecordPatchHandle
+                        != AUDIO_PATCH_HANDLE_NONE) ||
+                        (removedPatch->mPlaybackPatchHandle !=
+                                AUDIO_PATCH_HANDLE_NONE)) {
+                    clearPatchConnections(removedPatch);
+                }
                 mPatches.removeAt(index);
                 delete removedPatch;
                 break;