summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorEric Laurent <elaurent@google.com>2015-01-06 23:12:06 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-01-06 23:12:07 +0000
commitaee1c89f3d1868e77208bc64f9f1b2fc5c4a3514 (patch)
tree9ef5f83a7a1072e1450c0d7a1ad12a00beea254d /services
parentea7fba9abadcc3aae9c9b71bf67f2dd657c5b5dd (diff)
parente443ffac2a09b69470c4663ee031a527c53738d9 (diff)
downloadframeworks_av-aee1c89f3d1868e77208bc64f9f1b2fc5c4a3514.zip
frameworks_av-aee1c89f3d1868e77208bc64f9f1b2fc5c4a3514.tar.gz
frameworks_av-aee1c89f3d1868e77208bc64f9f1b2fc5c4a3514.tar.bz2
Merge "DO NOT MERGE - fix memory leak in PatchPanel" into lmp-mr1-dev
Diffstat (limited to 'services')
-rw-r--r--services/audioflinger/PatchPanel.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/services/audioflinger/PatchPanel.cpp b/services/audioflinger/PatchPanel.cpp
index 7544052..4f0c6b1 100644
--- a/services/audioflinger/PatchPanel.cpp
+++ b/services/audioflinger/PatchPanel.cpp
@@ -166,7 +166,9 @@ status_t AudioFlinger::PatchPanel::createAudioPatch(const struct audio_patch *pa
if (*handle == mPatches[index]->mHandle) {
ALOGV("createAudioPatch() removing patch handle %d", *handle);
halHandle = mPatches[index]->mHalHandle;
+ Patch *removedPatch = mPatches[index];
mPatches.removeAt(index);
+ delete removedPatch;
break;
}
}