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

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

Merge "Make member function as const whenever possible."

parents 5719bceb 7c334a12

cmds/statsd/src/StatsLogProcessor.cpp

+1 −1
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ void StatsLogProcessor::OnConfigUpdated(const ConfigKey& key, const StatsdConfig 
    }

}



size_t StatsLogProcessor::GetMetricsSize(const ConfigKey& key) {

size_t StatsLogProcessor::GetMetricsSize(const ConfigKey& key) const {

    auto it = mMetricsManagers.find(key);

    if (it == mMetricsManagers.end()) {

        ALOGW("Config source %s does not exist", key.ToString().c_str());

cmds/statsd/src/StatsLogProcessor.h

+2 −2
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ public: 
    void OnConfigUpdated(const ConfigKey& key, const StatsdConfig& config);

    void OnConfigRemoved(const ConfigKey& key);



    size_t GetMetricsSize(const ConfigKey& key);

    size_t GetMetricsSize(const ConfigKey& key) const;



    void onDumpReport(const ConfigKey& key, vector<uint8_t>* outData);

    void onAnomalyAlarmFired(

cmds/statsd/src/condition/CombinationConditionTracker.cpp

+2 −1
Original line number Diff line number Diff line
@@ -104,7 +104,8 @@ bool CombinationConditionTracker::init(const vector<Condition>& allConditionConf 


void CombinationConditionTracker::isConditionMet(

        const map<string, HashableDimensionKey>& conditionParameters,

        const vector<sp<ConditionTracker>>& allConditions, vector<ConditionState>& conditionCache) {

        const vector<sp<ConditionTracker>>& allConditions,

        vector<ConditionState>& conditionCache) const {

    for (const int childIndex : mChildren) {

        if (conditionCache[childIndex] == ConditionState::kNotEvaluated) {

            allConditions[childIndex]->isConditionMet(conditionParameters, allConditions,

cmds/statsd/src/condition/CombinationConditionTracker.h

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ public: 


    void isConditionMet(const std::map<std::string, HashableDimensionKey>& conditionParameters,

                        const std::vector<sp<ConditionTracker>>& allConditions,

                        std::vector<ConditionState>& conditionCache) override;

                        std::vector<ConditionState>& conditionCache) const override;



private:

    LogicalOperation mLogicalOperation;

cmds/statsd/src/condition/ConditionTracker.h

+2 −2
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ public: 
                                   std::vector<bool>& conditionChanged) = 0;



    // Return the current condition state.

    virtual ConditionState isConditionMet() {

    virtual ConditionState isConditionMet() const {

        return mNonSlicedConditionState;

    };
@@ -85,7 +85,7 @@ public: 
    virtual void isConditionMet(

            const std::map<std::string, HashableDimensionKey>& conditionParameters,

            const std::vector<sp<ConditionTracker>>& allConditions,

            std::vector<ConditionState>& conditionCache) = 0;

            std::vector<ConditionState>& conditionCache) const = 0;



    // return the list of LogMatchingTracker index that this ConditionTracker uses.

    virtual const std::set<int>& getLogTrackerIndex() const {