summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2013-11-13 15:26:53 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2013-11-13 15:26:53 -0800
commit3857dbe11c723795e9456e5934ca3a4a3513e4b7 (patch)
tree22eabfe304c73e101dfc74d16f75234bf630fb1d /media
parent117e4014c693d422150dffe86111a15aacd783f2 (diff)
parent84f4ad807152b6266431144425f153c48db28696 (diff)
downloadframeworks_base-3857dbe11c723795e9456e5934ca3a4a3513e4b7.zip
frameworks_base-3857dbe11c723795e9456e5934ca3a4a3513e4b7.tar.gz
frameworks_base-3857dbe11c723795e9456e5934ca3a4a3513e4b7.tar.bz2
am 84f4ad80: am 87c5eeb4: Merge "Fix a JNI local reference leak in JNIMediaPlayerListener::notify."
* commit '84f4ad807152b6266431144425f153c48db28696': Fix a JNI local reference leak in JNIMediaPlayerListener::notify.
Diffstat (limited to 'media')
-rw-r--r--media/jni/android_media_MediaPlayer.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/media/jni/android_media_MediaPlayer.cpp b/media/jni/android_media_MediaPlayer.cpp
index d134667..4be9cd6 100644
--- a/media/jni/android_media_MediaPlayer.cpp
+++ b/media/jni/android_media_MediaPlayer.cpp
@@ -115,6 +115,7 @@ void JNIMediaPlayerListener::notify(int msg, int ext1, int ext2, const Parcel *o
nativeParcel->setData(obj->data(), obj->dataSize());
env->CallStaticVoidMethod(mClass, fields.post_event, mObject,
msg, ext1, ext2, jParcel);
+ env->DeleteLocalRef(jParcel);
}
} else {
env->CallStaticVoidMethod(mClass, fields.post_event, mObject,