diff options
| author | James Dong <jdong@google.com> | 2012-07-18 20:18:41 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-07-18 20:18:41 -0700 |
| commit | c64c1cbef4d52cbd82c38485be3270eddf743f98 (patch) | |
| tree | d804a91c887c6edd749e012a1c3158d081f8058c /media/java | |
| parent | ee443b2819e70718ef98eaca65f6c8f1e0fcd398 (diff) | |
| parent | d1a0a53eec141b615697652b3a8907a60298a414 (diff) | |
| download | frameworks_base-c64c1cbef4d52cbd82c38485be3270eddf743f98.zip frameworks_base-c64c1cbef4d52cbd82c38485be3270eddf743f98.tar.gz frameworks_base-c64c1cbef4d52cbd82c38485be3270eddf743f98.tar.bz2 | |
am d1a0a53e: am 5d478b9c: Merge "Changed to obtain a parcel in each notify() call in jni." into jb-dev
* commit 'd1a0a53eec141b615697652b3a8907a60298a414':
Changed to obtain a parcel in each notify() call in jni.
Diffstat (limited to 'media/java')
| -rw-r--r-- | media/java/android/media/MediaPlayer.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/media/java/android/media/MediaPlayer.java b/media/java/android/media/MediaPlayer.java index e76d25a..870a4a9 100644 --- a/media/java/android/media/MediaPlayer.java +++ b/media/java/android/media/MediaPlayer.java @@ -2026,6 +2026,7 @@ public class MediaPlayer if (msg.obj instanceof Parcel) { Parcel parcel = (Parcel)msg.obj; TimedText text = new TimedText(parcel); + parcel.recycle(); mOnTimedTextListener.onTimedText(mMediaPlayer, text); } } |