summaryrefslogtreecommitdiff
path: root/media/jni/android_media_MediaExtractor.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_MediaExtractor.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_MediaExtractor.cpp')
-rw-r--r--media/jni/android_media_MediaExtractor.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/media/jni/android_media_MediaExtractor.cpp b/media/jni/android_media_MediaExtractor.cpp
index 3c3349359e82..c2cfed9bfa2f 100644
--- a/media/jni/android_media_MediaExtractor.cpp
+++ b/media/jni/android_media_MediaExtractor.cpp
@@ -811,9 +811,9 @@ static void android_media_MediaExtractor_native_finalize(
}
static jobject
-android_media_MediaExtractor_getMetrics(JNIEnv * env, jobject thiz)
+android_media_MediaExtractor_native_getMetrics(JNIEnv * env, jobject thiz)
{
- ALOGV("android_media_MediaExtractor_getMetrics");
+ ALOGV("android_media_MediaExtractor_native_getMetrics");
sp<JMediaExtractor> extractor = getMediaExtractor(env, thiz);
if (extractor == NULL ) {
@@ -905,8 +905,8 @@ static const JNINativeMethod gMethods[] = {
{ "hasCacheReachedEndOfStream", "()Z",
(void *)android_media_MediaExtractor_hasCacheReachedEOS },
- {"getMetrics", "()Landroid/os/Bundle;",
- (void *)android_media_MediaExtractor_getMetrics},
+ {"native_getMetrics", "()Landroid/os/Bundle;",
+ (void *)android_media_MediaExtractor_native_getMetrics},
};
int register_android_media_MediaExtractor(JNIEnv *env) {