commit ba6777e524d1fdd677a1e1e0282688ea2eb28179
author Robert Shih <robertshih@google.com> Tue Nov 12 13:04:59 2019 -0800
committer Robert Shih <robertshih@google.com> Wed Nov 27 02:38:12 2019 +0000
tree 9f89b61875187b8e1c65a3ebab6463d12c157991
parent 4b21979219cb2a3a440792b30aff75f3f9dfcc5c

MediaDrm jni: use DrmMetricsConsumer

Bug: 134787536
Test: MediaDrmMetricsTest
Change-Id: Ied0b106f6d4a59ad32ada5f674da1bfd400e68c1

media/jni/android_media_MediaDrm.cpp

diff --git a/media/jni/android_media_MediaDrm.cpp b/media/jni/android_media_MediaDrm.cpp
index 3833c6b..acda18e 100644
--- a/media/jni/android_media_MediaDrm.cpp
+++ b/media/jni/android_media_MediaDrm.cpp
@@ -32,7 +32,9 @@
 #include <cutils/properties.h>
 #include <media/stagefright/foundation/ADebug.h>
 #include <media/stagefright/MediaErrors.h>
+#include <mediadrm/DrmMetricsConsumer.h>
 #include <mediadrm/DrmUtils.h>
+#include <mediadrm/IDrmMetricsConsumer.h>
 #include <mediadrm/IDrm.h>
 
 using ::android::os::PersistableBundle;
@@ -1889,7 +1891,8 @@
 
     // Retrieve current metrics snapshot from drm.
     PersistableBundle metrics;
-    status_t err = drm->getMetrics(&metrics);
+    sp<IDrmMetricsConsumer> consumer(new DrmMetricsConsumer(&metrics));
+    status_t err = drm->getMetrics(consumer);
     if (err != OK) {
         ALOGE("getMetrics failed: %d", (int)err);
         return (jobject) NULL;