diff options
| author | Marco Nelissen <marcone@google.com> | 2015-02-11 00:36:48 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-02-11 00:36:48 +0000 |
| commit | 9408ce362e6c01656f280696af3aabd190d53356 (patch) | |
| tree | 266d3e600d2f914c14a801b12500c418d994c382 /media | |
| parent | a18554e6ca9f6fe06b37dec2ddc29e2f44068619 (diff) | |
| parent | fb14e77f45fbad139a0b0c9278bd003964b8f987 (diff) | |
| download | frameworks_base-9408ce362e6c01656f280696af3aabd190d53356.zip frameworks_base-9408ce362e6c01656f280696af3aabd190d53356.tar.gz frameworks_base-9408ce362e6c01656f280696af3aabd190d53356.tar.bz2 | |
am 6da3cc59: am 396f131d: Merge "Fix memory leak"
automerge: fb14e77
* commit 'fb14e77f45fbad139a0b0c9278bd003964b8f987':
Fix memory leak
Diffstat (limited to 'media')
| -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; } |