diff options
| -rw-r--r-- | media/java/android/media/MediaPlayer.java | 7 | ||||
| -rw-r--r-- | media/jni/android_media_MediaPlayer.cpp | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/media/java/android/media/MediaPlayer.java b/media/java/android/media/MediaPlayer.java index d9217a0b40ec..907615de02c8 100644 --- a/media/java/android/media/MediaPlayer.java +++ b/media/java/android/media/MediaPlayer.java @@ -1108,7 +1108,12 @@ public class MediaPlayer implements SubtitleController.Listener * * @throws IllegalStateException if it is called in an invalid state */ - public native void prepare() throws IOException, IllegalStateException; + public void prepare() throws IOException, IllegalStateException { + _prepare(); + scanInternalSubtitleTracks(); + } + + private native void _prepare() throws IOException, IllegalStateException; /** * Prepares the player for playback, asynchronously. diff --git a/media/jni/android_media_MediaPlayer.cpp b/media/jni/android_media_MediaPlayer.cpp index 4587cf5685c4..73a924def2d3 100644 --- a/media/jni/android_media_MediaPlayer.cpp +++ b/media/jni/android_media_MediaPlayer.cpp @@ -861,7 +861,7 @@ static JNINativeMethod gMethods[] = { {"_setDataSource", "(Ljava/io/FileDescriptor;JJ)V", (void *)android_media_MediaPlayer_setDataSourceFD}, {"_setVideoSurface", "(Landroid/view/Surface;)V", (void *)android_media_MediaPlayer_setVideoSurface}, - {"prepare", "()V", (void *)android_media_MediaPlayer_prepare}, + {"_prepare", "()V", (void *)android_media_MediaPlayer_prepare}, {"prepareAsync", "()V", (void *)android_media_MediaPlayer_prepareAsync}, {"_start", "()V", (void *)android_media_MediaPlayer_start}, {"_stop", "()V", (void *)android_media_MediaPlayer_stop}, |