summaryrefslogtreecommitdiff
path: root/media/jni/android_media_MediaPlayer.cpp
diff options
context:
space:
mode:
authorRay Essick <essick@google.com>2017-03-09 10:17:51 -0800
committerRay Essick <essick@google.com>2017-03-15 11:43:08 -0700
commitf2d0e40bf01fa133dd6b36f3716005d53fa9776c (patch)
treea03a063db18a399aa6008e916e2110576c8d2208 /media/jni/android_media_MediaPlayer.cpp
parentcf8a98af481923bc61db347fdf053ea6e9152731 (diff)
Integrate API Council feedback into Media Metrics APIs
Integrates the API Council's feedback into the Media Metrics related APIs. -- return types for the getMetrics() calls -- definition of keys in the set of data that comes back Bug: 35811992 Test: booted, CTS subset, checked dumpsys media.metrics output Change-Id: Ib750f9631bd3453be3132760273ccfff0a891f88
Diffstat (limited to 'media/jni/android_media_MediaPlayer.cpp')
-rw-r--r--media/jni/android_media_MediaPlayer.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/media/jni/android_media_MediaPlayer.cpp b/media/jni/android_media_MediaPlayer.cpp
index 27724a185c36..1b52cf58cbff 100644
--- a/media/jni/android_media_MediaPlayer.cpp
+++ b/media/jni/android_media_MediaPlayer.cpp
@@ -708,7 +708,7 @@ android_media_MediaPlayer_getVideoHeight(JNIEnv *env, jobject thiz)
}
static jobject
-android_media_MediaPlayer_getMetrics(JNIEnv *env, jobject thiz)
+android_media_MediaPlayer_native_getMetrics(JNIEnv *env, jobject thiz)
{
sp<MediaPlayer> mp = getMediaPlayer(env, thiz);
if (mp == NULL ) {
@@ -1393,7 +1393,7 @@ static const JNINativeMethod gMethods[] = {
{"_stop", "()V", (void *)android_media_MediaPlayer_stop},
{"getVideoWidth", "()I", (void *)android_media_MediaPlayer_getVideoWidth},
{"getVideoHeight", "()I", (void *)android_media_MediaPlayer_getVideoHeight},
- {"getMetrics", "()Landroid/os/Bundle;", (void *)android_media_MediaPlayer_getMetrics},
+ {"native_getMetrics", "()Landroid/os/Bundle;", (void *)android_media_MediaPlayer_native_getMetrics},
{"setPlaybackParams", "(Landroid/media/PlaybackParams;)V", (void *)android_media_MediaPlayer_setPlaybackParams},
{"getPlaybackParams", "()Landroid/media/PlaybackParams;", (void *)android_media_MediaPlayer_getPlaybackParams},
{"setSyncParams", "(Landroid/media/SyncParams;)V", (void *)android_media_MediaPlayer_setSyncParams},