diff options
| author | Marco Nelissen <marcone@google.com> | 2015-02-11 00:00:57 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-11 00:00:57 +0000 |
| commit | fb14e77f45fbad139a0b0c9278bd003964b8f987 (patch) | |
| tree | 5c6dee4fa1f9c087105b3ef07b90425502f0bf32 /media/jni | |
| parent | efa5b6142082d8c958b09a932fc972261c405912 (diff) | |
| parent | 6da3cc59a0e77e723a8413d2443b0f1bc5821b03 (diff) | |
| download | frameworks_base-fb14e77f45fbad139a0b0c9278bd003964b8f987.zip frameworks_base-fb14e77f45fbad139a0b0c9278bd003964b8f987.tar.gz frameworks_base-fb14e77f45fbad139a0b0c9278bd003964b8f987.tar.bz2 | |
am 6da3cc59: am 396f131d: Merge "Fix memory leak"
* commit '6da3cc59a0e77e723a8413d2443b0f1bc5821b03':
Fix memory leak
Diffstat (limited to 'media/jni')
| -rw-r--r-- | media/jni/soundpool/SoundPool.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/media/jni/soundpool/SoundPool.cpp b/media/jni/soundpool/SoundPool.cpp index a8b91d24c..a73209b 100644 --- a/media/jni/soundpool/SoundPool.cpp +++ b/media/jni/soundpool/SoundPool.cpp @@ -484,6 +484,7 @@ static status_t decode(int fd, int64_t offset, int64_t length, status_t err = AMediaExtractor_setDataSourceFd(ex, fd, offset, length); if (err != AMEDIA_OK) { + AMediaExtractor_delete(ex); return err; } |