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

Commit 00bafb3b authored by Andy Hung's avatar Andy Hung Committed by Automerger Merge Worker
Browse files

Merge "MediaMetrics: Convert to AIDL" into sc-dev am: 69945b28 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13441560

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I699e070cea110319c85be87b7705d67cf3afa34a
parents fa074816 69945b28

media/jni/android_media_MediaMetricsJNI.cpp

+1 −7
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ 


#include <binder/Parcel.h>

#include <jni.h>

#include <media/IMediaMetricsService.h>

#include <media/MediaMetricsItem.h>

#include <nativehelper/JNIHelp.h>

#include <variant>
@@ -151,12 +150,7 @@ static jint android_media_MediaMetrics_submit_bytebuffer( 
        return (jint)BAD_VALUE;

    }



    sp<IMediaMetricsService> service = mediametrics::BaseItem::getService();

    if (service == nullptr) {

        ALOGW("Cannot retrieve mediametrics service");

        return (jint)NO_INIT;

    }

    return (jint)service->submitBuffer((char *)buffer, length);

    return (jint)mediametrics::BaseItem::submitBuffer((char *)buffer, length);

}



// Helper function to convert a native PersistableBundle to a Java