diff options
| author | James Dong <jdong@google.com> | 2012-04-12 12:08:31 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-04-12 12:08:31 -0700 |
| commit | f3d9f5d097dffec33f416d0907d4a6e0dae43f69 (patch) | |
| tree | 0d09897b960426126de720f0284105c8d9606857 /media/jni | |
| parent | 793807fff1e65d9049a1bea0a582e6edc1b80dde (diff) | |
| parent | e00b6f3a57d4b480ce674468de93555269bbd71a (diff) | |
| download | frameworks_base-f3d9f5d097dffec33f416d0907d4a6e0dae43f69.zip frameworks_base-f3d9f5d097dffec33f416d0907d4a6e0dae43f69.tar.gz frameworks_base-f3d9f5d097dffec33f416d0907d4a6e0dae43f69.tar.bz2 | |
Merge "Fix failure from setDataSource(String path) when path is a local file"
Diffstat (limited to 'media/jni')
| -rw-r--r-- | media/jni/android_media_MediaPlayer.cpp | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/media/jni/android_media_MediaPlayer.cpp b/media/jni/android_media_MediaPlayer.cpp index 2e74ffd..5eadb3a 100644 --- a/media/jni/android_media_MediaPlayer.cpp +++ b/media/jni/android_media_MediaPlayer.cpp @@ -216,12 +216,6 @@ android_media_MediaPlayer_setDataSourceAndHeaders( } static void -android_media_MediaPlayer_setDataSource(JNIEnv *env, jobject thiz, jstring path) -{ - android_media_MediaPlayer_setDataSourceAndHeaders(env, thiz, path, NULL, NULL); -} - -static void android_media_MediaPlayer_setDataSourceFD(JNIEnv *env, jobject thiz, jobject fileDescriptor, jlong offset, jlong length) { sp<MediaPlayer> mp = getMediaPlayer(env, thiz); @@ -825,8 +819,6 @@ android_media_MediaPlayer_setNextMediaPlayer(JNIEnv *env, jobject thiz, jobject // ---------------------------------------------------------------------------- static JNINativeMethod gMethods[] = { - {"setDataSource", "(Ljava/lang/String;)V", (void *)android_media_MediaPlayer_setDataSource}, - { "_setDataSource", "(Ljava/lang/String;[Ljava/lang/String;[Ljava/lang/String;)V", |