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

Commit 2837883e authored by Kelly Rossmoyer's avatar Kelly Rossmoyer
Browse files

Update language to comply with Android's inclusive language guidance 

See https://source.android.com/setup/contribute/respectful-code for reference

BUG=161896447

Test: make (change is only comments + 1 log message)

Change-Id: I8a21ef4ce19c517853388d8f7542f3a0cf8d91d5
Merged-In: I26ef8e079bf13f19bdc3bbc8219f572a43b68090
parent 8ac6741e

cmds/incidentd/tests/section_list.cpp

+1 −1
Original line number Diff line number Diff line 
// This file is a dummy section_list.cpp used for test only.

// This file is a stub section_list.cpp used for test only.

#include "section_list.h"



#include "frameworks/base/cmds/incidentd/tests/test_proto.pb.h"

cmds/statsd/src/metrics/GaugeMetricProducer.h

+2 −2
Original line number Diff line number Diff line
@@ -170,14 +170,14 @@ private: 
    // for each slice with the latest value.

    void updateCurrentSlicedBucketForAnomaly();



    // Whitelist of fields to report. Empty means all are reported.

    // Allowlist of fields to report. Empty means all are reported.

    std::vector<Matcher> mFieldMatchers;



    GaugeMetric::SamplingType mSamplingType;



    const int64_t mMaxPullDelayNs;



    // apply a whitelist on the original input

    // apply an allowlist on the original input

    std::shared_ptr<vector<FieldValue>> getGaugeFields(const LogEvent& event);



    // Util function to check whether the specified dimension hits the guardrail.

cmds/statsd/src/metrics/MetricsManager.cpp

+1 −1
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ MetricsManager::MetricsManager(const ConfigKey& key, const StatsdConfig& config, 
    // Init allowed pushed atom uids.

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

        mConfigValid = false;

        ALOGE("Log source whitelist is empty! This config won't get any data. Suggest adding at "

        ALOGE("Log source allowlist is empty! This config won't get any data. Suggest adding at "

                      "least AID_SYSTEM and AID_STATSD to the allowed_log_source field.");

    } else {

        for (const auto& source : config.allowed_log_source()) {

cmds/statsd/src/stats_log_util.h

+1 −1
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ bool parseProtoOutputStream(ProtoOutputStream& protoOutput, T* message) { 
    return message->ParseFromArray(pbBytes.c_str(), pbBytes.size());

}



// Checks the truncate timestamp annotation as well as the blacklisted range of 300,000 - 304,999.

// Checks the truncate timestamp annotation as well as the restricted range of 300,000 - 304,999.

// Returns the truncated timestamp to the nearest 5 minutes if needed.

int64_t truncateTimestampIfNecessary(const LogEvent& event);

cmds/statsd/tests/StatsLogProcessor_test.cpp

+1 −1
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ TEST(StatsLogProcessorTest, TestRateLimitByteSize) { 
    sp<StatsPullerManager> pullerManager = new StatsPullerManager();

    sp<AlarmMonitor> anomalyAlarmMonitor;

    sp<AlarmMonitor> periodicAlarmMonitor;

    // Construct the processor with a dummy sendBroadcast function that does nothing.

    // Construct the processor with a no-op sendBroadcast function that does nothing.

    StatsLogProcessor p(m, pullerManager, anomalyAlarmMonitor, periodicAlarmMonitor, 0,

                        [](const ConfigKey& key) { return true; },

                        [](const int&, const vector<int64_t>&) {return true;});