summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2013-11-13 15:21:51 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2013-11-13 15:21:51 -0800
commit84f4ad807152b6266431144425f153c48db28696 (patch)
tree9179ea9536db32dcd6de70c369aba4624b518c30 /media
parent6eddb39c857b178672218a345a276c4304e7ad37 (diff)
parent87c5eeb48b1a0c498eae9bd2877fb33678d90b8a (diff)
downloadframeworks_base-84f4ad807152b6266431144425f153c48db28696.zip
frameworks_base-84f4ad807152b6266431144425f153c48db28696.tar.gz
frameworks_base-84f4ad807152b6266431144425f153c48db28696.tar.bz2
am 87c5eeb4: Merge "Fix a JNI local reference leak in JNIMediaPlayerListener::notify."
* commit '87c5eeb48b1a0c498eae9bd2877fb33678d90b8a': 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 7c607ea..d06380d 100644
--- a/media/jni/android_media_MediaPlayer.cpp
+++ b/media/jni/android_media_MediaPlayer.cpp
@@ -114,6 +114,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,