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

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

Merge "Statsd uidmap includes vers string and installer"

parents 8d130a1e 730403e7

cmds/statsd/src/StatsLogProcessor.cpp

+3 −5
Original line number Diff line number Diff line
@@ -370,11 +370,9 @@ void StatsLogProcessor::onConfigMetricsReportLocked(const ConfigKey& key, 
    // This skips the uid map if it's an empty config.

    if (it->second->getNumMetrics() > 0) {

        uint64_t uidMapToken = proto->start(FIELD_TYPE_MESSAGE | FIELD_ID_UID_MAP);

        if (it->second->hashStringInReport()) {

            mUidMap->appendUidMap(dumpTimeStampNs, key, &str_set, proto);

        } else {

            mUidMap->appendUidMap(dumpTimeStampNs, key, nullptr, proto);

        }

        mUidMap->appendUidMap(

                dumpTimeStampNs, key, it->second->hashStringInReport() ? &str_set : nullptr,

                it->second->versionStringsInReport(), it->second->installerInReport(), proto);

        proto->end(uidMapToken);

    }

cmds/statsd/src/StatsService.cpp

+7 −4
Original line number Diff line number Diff line
@@ -787,21 +787,24 @@ status_t StatsService::cmd_print_logs(int out, const Vector<String8>& args) { 
}



Status StatsService::informAllUidData(const vector<int32_t>& uid, const vector<int64_t>& version,

                                      const vector<String16>& app) {

                                      const vector<String16>& version_string,

                                      const vector<String16>& app,

                                      const vector<String16>& installer) {

    ENFORCE_UID(AID_SYSTEM);



    VLOG("StatsService::informAllUidData was called");

    mUidMap->updateMap(getElapsedRealtimeNs(), uid, version, app);

    mUidMap->updateMap(getElapsedRealtimeNs(), uid, version, version_string, app, installer);

    VLOG("StatsService::informAllUidData succeeded");



    return Status::ok();

}



Status StatsService::informOnePackage(const String16& app, int32_t uid, int64_t version) {

Status StatsService::informOnePackage(const String16& app, int32_t uid, int64_t version,

                                      const String16& version_string, const String16& installer) {

    ENFORCE_UID(AID_SYSTEM);



    VLOG("StatsService::informOnePackage was called");

    mUidMap->updateApp(getElapsedRealtimeNs(), app, uid, version);

    mUidMap->updateApp(getElapsedRealtimeNs(), app, uid, version, version_string, installer);

    return Status::ok();

}

cmds/statsd/src/StatsService.h

+4 −2
Original line number Diff line number Diff line
@@ -73,8 +73,10 @@ public: 
    virtual Status informAlarmForSubscriberTriggeringFired();



    virtual Status informAllUidData(const vector<int32_t>& uid, const vector<int64_t>& version,

                                    const vector<String16>& app);

    virtual Status informOnePackage(const String16& app, int32_t uid, int64_t version);

                                    const vector<String16>& version_string,

                                    const vector<String16>& app, const vector<String16>& installer);

    virtual Status informOnePackage(const String16& app, int32_t uid, int64_t version,

                                    const String16& version_string, const String16& installer);

    virtual Status informOnePackageRemoved(const String16& app, int32_t uid);

    virtual Status informDeviceShutdown();

cmds/statsd/src/metrics/MetricsManager.cpp

+2 −0
Original line number Diff line number Diff line
@@ -77,6 +77,8 @@ MetricsManager::MetricsManager(const ConfigKey& key, const StatsdConfig& config, 
            mActivationAtomTrackerToMetricMap, mMetricIndexesWithActivation, mNoReportMetricIds);



    mHashStringsInReport = config.hash_strings_in_metric_report();

    mVersionStringsInReport = config.version_strings_in_metric_report();

    mInstallerInReport = config.installer_in_metric_report();



    if (config.allowed_log_source_size() == 0) {

        mConfigValid = false;

cmds/statsd/src/metrics/MetricsManager.h

+10 −0
Original line number Diff line number Diff line
@@ -83,6 +83,14 @@ public: 
        return mHashStringsInReport;

    };



    inline bool versionStringsInReport() const {

        return mVersionStringsInReport;

    };



    inline bool installerInReport() const {

        return mInstallerInReport;

    };



    void refreshTtl(const int64_t currentTimestampNs) {

        if (mTtlNs > 0) {

            mTtlEndNs = currentTimestampNs + mTtlNs;
@@ -126,6 +134,8 @@ private: 
    bool mConfigValid = false;



    bool mHashStringsInReport = false;

    bool mVersionStringsInReport = false;

    bool mInstallerInReport = false;



    const int64_t mTtlNs;

    int64_t mTtlEndNs;