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

Commit 7cd7ed66 authored by Robert Shih's avatar Robert Shih Committed by Automerger Merge Worker
Browse files

Merge "statsd_drm: s/apex_version/PROPERTY_VERSION/" am: d98fd9c2 

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2449810



Change-Id: Ife1cc52b6aeb2ceca5a0ba606abf00b3fffbbe10
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 23de09b9 d98fd9c2

services/mediametrics/statsd_drm.cpp

+12 −12
Original line number Original line Diff line number Diff line
@@ -248,10 +248,10 @@ bool statsd_mediadrm_created(const std::shared_ptr<const mediametrics::Item>& it 
    if (!item->getInt32("frontend", &frontend)) return false;

    if (!item->getInt32("frontend", &frontend)) return false;





    // Optional to be included

    // Optional to be included

    int64_t apex_version = -1;

    std::string version = "";

    item->getInt64("apex_version", &apex_version);

    item->getString("version", &version);

    const int result = stats_write(stats::media_metrics::MEDIA_DRM_CREATED,

    const int result = stats_write(stats::media_metrics::MEDIA_DRM_CREATED,

                    scheme, uuid_lsb, uuid_msb, uid, frontend, apex_version);

                    scheme, uuid_lsb, uuid_msb, uid, frontend, version.c_str());





    std::stringstream log;

    std::stringstream log;

    log << "result:" << result << " {"

    log << "result:" << result << " {"
@@ -262,7 +262,7 @@ bool statsd_mediadrm_created(const std::shared_ptr<const mediametrics::Item>& it 
            << " uuid_msb:" << uuid_msb

            << " uuid_msb:" << uuid_msb

            << " uid:" << uid

            << " uid:" << uid

            << " frontend:" << frontend

            << " frontend:" << frontend

            << " apex_version:" << apex_version

            << " version:" << version

            << " }";

            << " }";

    statsdLog->log(stats::media_metrics::MEDIA_DRM_CREATED, log.str());

    statsdLog->log(stats::media_metrics::MEDIA_DRM_CREATED, log.str());

    return true;

    return true;
@@ -287,10 +287,10 @@ bool statsd_mediadrm_session_opened(const std::shared_ptr<const mediametrics::It 
    if (!item->getInt32("opened_security_level", &opened_security_level)) return false;

    if (!item->getInt32("opened_security_level", &opened_security_level)) return false;





    // Optional to be included

    // Optional to be included

    int64_t apex_version = -1;

    std::string version = "";

    item->getInt64("apex_version", &apex_version);

    item->getString("version", &version);

    const int result = stats_write(stats::media_metrics::MEDIA_DRM_SESSION_OPENED,

    const int result = stats_write(stats::media_metrics::MEDIA_DRM_SESSION_OPENED,

                        scheme, uuid_lsb, uuid_msb, uid, frontend, apex_version,

                        scheme, uuid_lsb, uuid_msb, uid, frontend, version.c_str(),

                        object_nonce.c_str(), requested_security_level,

                        object_nonce.c_str(), requested_security_level,

                        opened_security_level);

                        opened_security_level);
@@ -303,7 +303,7 @@ bool statsd_mediadrm_session_opened(const std::shared_ptr<const mediametrics::It 
            << " uuid_msb:" << uuid_msb

            << " uuid_msb:" << uuid_msb

            << " uid:" << uid

            << " uid:" << uid

            << " frontend:" << frontend

            << " frontend:" << frontend

            << " apex_version:" << apex_version

            << " version:" << version

            << " object_nonce:" << object_nonce

            << " object_nonce:" << object_nonce

            << " requested_security_level:" << requested_security_level

            << " requested_security_level:" << requested_security_level

            << " opened_security_level:" << opened_security_level

            << " opened_security_level:" << opened_security_level
@@ -334,8 +334,8 @@ bool statsd_mediadrm_errored(const std::shared_ptr<const mediametrics::Item>& it 
    if (!item->getInt32("error_code", &error_code)) return false;

    if (!item->getInt32("error_code", &error_code)) return false;





    // Optional to be included

    // Optional to be included

    int64_t apex_version = -1;

    std::string version = "";

    item->getInt64("apex_version", &apex_version);

    item->getString("version", &version);

    std::string session_nonce = "";

    std::string session_nonce = "";

    item->getString("session_nonce", &session_nonce);

    item->getString("session_nonce", &session_nonce);
@@ -347,7 +347,7 @@ bool statsd_mediadrm_errored(const std::shared_ptr<const mediametrics::Item>& it 
    item->getInt32("error_context", &error_context);

    item->getInt32("error_context", &error_context);





    const int result = stats_write(stats::media_metrics::MEDIA_DRM_ERRORED, scheme, uuid_lsb,

    const int result = stats_write(stats::media_metrics::MEDIA_DRM_ERRORED, scheme, uuid_lsb,

                        uuid_msb, uid, frontend, apex_version, object_nonce.c_str(),

                        uuid_msb, uid, frontend, version.c_str(), object_nonce.c_str(),

                        session_nonce.c_str(), security_level, api, error_code, cdm_err,

                        session_nonce.c_str(), security_level, api, error_code, cdm_err,

                        oem_err, error_context);

                        oem_err, error_context);
@@ -360,7 +360,7 @@ bool statsd_mediadrm_errored(const std::shared_ptr<const mediametrics::Item>& it 
            << " uuid_msb:" << uuid_msb

            << " uuid_msb:" << uuid_msb

            << " uid:" << uid

            << " uid:" << uid

            << " frontend:" << frontend

            << " frontend:" << frontend

            << " apex_version:" << apex_version

            << " version:" << version

            << " object_nonce:" << object_nonce

            << " object_nonce:" << object_nonce

            << " session_nonce:" << session_nonce

            << " session_nonce:" << session_nonce

            << " security_level:" << security_level

            << " security_level:" << security_level