Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cd169355 authored by Robert Shih's avatar Robert Shih Committed by Android (Google) Code Review
Browse files

Merge "MediaDrm jni: use DrmMetricsConsumer"

parents f79678a6 ba6777e5

media/jni/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ cc_library_shared { 
        "libmedia_omx",

        "libmediametrics",

        "libmediadrm",

        "libmediadrmmetrics_consumer",

        "libhwui",

        "libui",

        "liblog",

media/jni/android_media_MediaDrm.cpp

+4 −1
Original line number Diff line number Diff line
@@ -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 @@ android_media_MediaDrm_native_getMetrics(JNIEnv *env, jobject thiz) 


    // 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;