diff options
| author | Robert Shih <robertshih@google.com> | 2015-06-01 21:55:49 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-01 21:56:35 +0000 |
| commit | eb8a51f359e4e1f4187eb14fa5e584979d26768b (patch) | |
| tree | 915b1f8346ade5a48895d1e0f42183df391ea04c /media/jni | |
| parent | bdd500ecd4ceea7d4e4a06ece08c9b9fd5d8aec5 (diff) | |
| parent | 07830aa6ba4804880df3cb39f8932aa6b3906a8a (diff) | |
| download | frameworks_base-eb8a51f359e4e1f4187eb14fa5e584979d26768b.zip frameworks_base-eb8a51f359e4e1f4187eb14fa5e584979d26768b.tar.gz frameworks_base-eb8a51f359e4e1f4187eb14fa5e584979d26768b.tar.bz2 | |
Merge "MediaPlayer: trigger onError instead of exception on stale native notifications" into mnc-dev
Diffstat (limited to 'media/jni')
| -rw-r--r-- | media/jni/android_media_MediaPlayer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/jni/android_media_MediaPlayer.cpp b/media/jni/android_media_MediaPlayer.cpp index 9c67278..d8041f4 100644 --- a/media/jni/android_media_MediaPlayer.cpp +++ b/media/jni/android_media_MediaPlayer.cpp @@ -1045,7 +1045,7 @@ static JNINativeMethod gMethods[] = { {"_setDataSource", "(Landroid/media/MediaDataSource;)V",(void *)android_media_MediaPlayer_setDataSourceCallback }, {"_setVideoSurface", "(Landroid/view/Surface;)V", (void *)android_media_MediaPlayer_setVideoSurface}, {"_prepare", "()V", (void *)android_media_MediaPlayer_prepare}, - {"_prepareAsync", "()V", (void *)android_media_MediaPlayer_prepareAsync}, + {"prepareAsync", "()V", (void *)android_media_MediaPlayer_prepareAsync}, {"_start", "()V", (void *)android_media_MediaPlayer_start}, {"_stop", "()V", (void *)android_media_MediaPlayer_stop}, {"getVideoWidth", "()I", (void *)android_media_MediaPlayer_getVideoWidth}, |