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

Commit 83dc265b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "use MediaAnalyticsItem::create() instead of new"

parents ffa6f919 6a305223

drm/libmediadrm/DrmHal.cpp

+7 −7
Original line number Diff line number Diff line
@@ -1556,22 +1556,22 @@ void DrmHal::writeByteArray(Parcel &obj, hidl_vec<uint8_t> const &vec) 


void DrmHal::reportFrameworkMetrics() const

{

    MediaAnalyticsItem item("mediadrm");

    item.generateSessionID();

    item.setPkgName(mMetrics.GetAppPackageName().c_str());

    std::unique_ptr<MediaAnalyticsItem> item(MediaAnalyticsItem::create("mediadrm"));

    item->generateSessionID();

    item->setPkgName(mMetrics.GetAppPackageName().c_str());

    String8 vendor;

    String8 description;

    status_t result = getPropertyStringInternal(String8("vendor"), vendor);

    if (result != OK) {

        ALOGE("Failed to get vendor from drm plugin: %d", result);

    } else {

        item.setCString("vendor", vendor.c_str());

        item->setCString("vendor", vendor.c_str());

    }

    result = getPropertyStringInternal(String8("description"), description);

    if (result != OK) {

        ALOGE("Failed to get description from drm plugin: %d", result);

    } else {

        item.setCString("description", description.c_str());

        item->setCString("description", description.c_str());

    }



    std::string serializedMetrics;
@@ -1582,9 +1582,9 @@ void DrmHal::reportFrameworkMetrics() const 
    std::string b64EncodedMetrics = toBase64StringNoPad(serializedMetrics.data(),

                                                        serializedMetrics.size());

    if (!b64EncodedMetrics.empty()) {

        item.setCString("serialized_metrics", b64EncodedMetrics.c_str());

        item->setCString("serialized_metrics", b64EncodedMetrics.c_str());

    }

    if (!item.selfrecord()) {

    if (!item->selfrecord()) {

        ALOGE("Failed to self record framework metrics");

    }

}

drm/libmediadrm/PluginMetricsReporting.cpp

+6 −6
Original line number Diff line number Diff line
@@ -34,17 +34,17 @@ constexpr char kSerializedMetricsField[] = "serialized_metrics"; 
status_t reportVendorMetrics(const std::string& metrics,

                             const String8& name,

                             const String8& appPackageName) {

    MediaAnalyticsItem analyticsItem(name.c_str());

    analyticsItem.generateSessionID();

    std::unique_ptr<MediaAnalyticsItem> analyticsItem(MediaAnalyticsItem::create(name.c_str()));

    analyticsItem->generateSessionID();



    std::string app_package_name(appPackageName.c_str(), appPackageName.size());

    analyticsItem.setPkgName(app_package_name);

    analyticsItem->setPkgName(app_package_name);

    if (metrics.size() > 0) {

        analyticsItem.setCString(kSerializedMetricsField, metrics.c_str());

        analyticsItem->setCString(kSerializedMetricsField, metrics.c_str());

    }



    if (!analyticsItem.selfrecord()) {

      ALOGE("selfrecord() returned false. sessioId %" PRId64, analyticsItem.getSessionID());

    if (!analyticsItem->selfrecord()) {

      ALOGE("selfrecord() returned false. sessioId %" PRId64, analyticsItem->getSessionID());

    }



    return OK;

media/libaudioclient/include/media/AudioRecord.h

+1 −1
Original line number Diff line number Diff line
@@ -719,7 +719,7 @@ private: 
private:

    class MediaMetrics {

      public:

        MediaMetrics() : mAnalyticsItem(new MediaAnalyticsItem("audiorecord")),

        MediaMetrics() : mAnalyticsItem(MediaAnalyticsItem::create("audiorecord")),

                         mCreatedNs(systemTime(SYSTEM_TIME_REALTIME)),

                         mStartedNs(0), mDurationNs(0), mCount(0),

                         mLastError(NO_ERROR) {

media/libaudioclient/include/media/AudioTrack.h

+1 −1
Original line number Diff line number Diff line
@@ -1227,7 +1227,7 @@ private: 
private:

    class MediaMetrics {

      public:

        MediaMetrics() : mAnalyticsItem(new MediaAnalyticsItem("audiotrack")) {

        MediaMetrics() : mAnalyticsItem(MediaAnalyticsItem::create("audiotrack")) {

        }

        ~MediaMetrics() {

            // mAnalyticsItem alloc failure will be flagged in the constructor

media/libmediametrics/include/MediaAnalyticsItem.h

+6 −3
Original line number Diff line number Diff line
@@ -82,16 +82,19 @@ class MediaAnalyticsItem { 
            PROTO_LAST = PROTO_V1,

        };



    private:

        // use the ::create() method instead

        MediaAnalyticsItem();

        MediaAnalyticsItem(Key);

        MediaAnalyticsItem(const MediaAnalyticsItem&);

        MediaAnalyticsItem &operator=(const MediaAnalyticsItem&);



    public:



        // so clients do not need to know size details

        static MediaAnalyticsItem* create(Key key);

        static MediaAnalyticsItem* create();



        // access functions for the class

        MediaAnalyticsItem();

        MediaAnalyticsItem(Key);

        ~MediaAnalyticsItem();



        // SessionID ties multiple submissions for same key together