summaryrefslogtreecommitdiff
path: root/media/jni/android_media_MediaCodec.cpp
diff options
context:
space:
mode:
authorRay Essick <essick@google.com>2017-04-14 10:22:55 -0700
committerRay Essick <essick@google.com>2017-04-14 17:24:42 -0700
commit10353e36018224b86ef2918d1d68107459d445cf (patch)
tree604398932ce57b6bc400801548ac1851c3df6e8b /media/jni/android_media_MediaCodec.cpp
parent8ac14522883e56697f11551b8689bb92421799f9 (diff)
Rework getMetrics() api per API council
Reworking the media metrics getMetrics() calls (currently in MediaCodec, MediaExtractor, MediaPlayer, and MediaRecorder) to fit new direction from the API Council. Drop the MediaMetricsSet that we had in the first round; go back to a PersistableBundle as the return type. Moves the key definitions from MediaMetricsSet.MediaCodec to MediaCodec.MetricsConstants Bug: 37083862 Test: ran the corresponding CTS tests Change-Id: I7905959ad2109887dd8fd16f0eb2831247abab2a
Diffstat (limited to 'media/jni/android_media_MediaCodec.cpp')
-rw-r--r--media/jni/android_media_MediaCodec.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/jni/android_media_MediaCodec.cpp b/media/jni/android_media_MediaCodec.cpp
index a8dd3133b275..2178607152c6 100644
--- a/media/jni/android_media_MediaCodec.cpp
+++ b/media/jni/android_media_MediaCodec.cpp
@@ -2002,7 +2002,7 @@ static const JNINativeMethod gMethods[] = {
{ "getName", "()Ljava/lang/String;",
(void *)android_media_MediaCodec_getName },
- { "native_getMetrics", "()Landroid/os/Bundle;",
+ { "native_getMetrics", "()Landroid/os/PersistableBundle;",
(void *)android_media_MediaCodec_native_getMetrics},
{ "setParameters", "([Ljava/lang/String;[Ljava/lang/Object;)V",