Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update language to comply with Android's inclusive language guidance" am: f8476d358f am: 779a1aedd5 am: 9f1608f214

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1377954

Change-Id: If391531e878e43b8856b230d3b5a12fb0e5492e1
This commit is contained in:
Kelly Rossmoyer
2020-09-11 03:53:49 +00:00
committed by Automerger Merge Worker
parent b2474e5f88 9f1608f214
commit c19fd3c4cb
6 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmds/incidentd/tests/section_list.cpp
View File

@@ -1,4 +1,4 @@
// 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 "section_list.h"
#include "frameworks/base/cmds/incidentd/tests/test_proto.pb.h" #include "frameworks/base/cmds/incidentd/tests/test_proto.pb.h"

4
cmds/statsd/src/metrics/GaugeMetricProducer.h
View File

@@ -170,14 +170,14 @@ private:
// for each slice with the latest value. // for each slice with the latest value.
void updateCurrentSlicedBucketForAnomaly(); 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; std::vector<Matcher> mFieldMatchers;
GaugeMetric::SamplingType mSamplingType; GaugeMetric::SamplingType mSamplingType;
const int64_t mMaxPullDelayNs; 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); std::shared_ptr<vector<FieldValue>> getGaugeFields(const LogEvent& event);
// Util function to check whether the specified dimension hits the guardrail. // Util function to check whether the specified dimension hits the guardrail.

2
cmds/statsd/src/metrics/MetricsManager.cpp
View File

@@ -91,7 +91,7 @@ MetricsManager::MetricsManager(const ConfigKey& key, const StatsdConfig& config,
// Init allowed pushed atom uids. // Init allowed pushed atom uids.
if (config.allowed_log_source_size() == 0) { if (config.allowed_log_source_size() == 0) {
mConfigValid = false; 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."); "least AID_SYSTEM and AID_STATSD to the allowed_log_source field.");
} else { } else {
for (const auto& source : config.allowed_log_source()) { for (const auto& source : config.allowed_log_source()) {

2
cmds/statsd/src/stats_log_util.h
View File

@@ -97,7 +97,7 @@ bool parseProtoOutputStream(ProtoOutputStream& protoOutput, T* message) {
return message->ParseFromArray(pbBytes.c_str(), pbBytes.size()); 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. // Returns the truncated timestamp to the nearest 5 minutes if needed.
int64_t truncateTimestampIfNecessary(const LogEvent& event); int64_t truncateTimestampIfNecessary(const LogEvent& event);

2
cmds/statsd/tests/StatsLogProcessor_test.cpp
View File

@@ -68,7 +68,7 @@ TEST(StatsLogProcessorTest, TestRateLimitByteSize) {
sp<StatsPullerManager> pullerManager = new StatsPullerManager(); sp<StatsPullerManager> pullerManager = new StatsPullerManager();
sp<AlarmMonitor> anomalyAlarmMonitor; sp<AlarmMonitor> anomalyAlarmMonitor;
sp<AlarmMonitor> periodicAlarmMonitor; 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, StatsLogProcessor p(m, pullerManager, anomalyAlarmMonitor, periodicAlarmMonitor, 0,
[](const ConfigKey& key) { return true; }, [](const ConfigKey& key) { return true; },
[](const int&, const vector<int64_t>&) {return true;}); [](const int&, const vector<int64_t>&) {return true;});

2
cmds/statsd/tests/UidMap_test.cpp
View File

@@ -44,7 +44,7 @@ TEST(UidMapTest, TestIsolatedUID) {
sp<StatsPullerManager> pullerManager = new StatsPullerManager(); sp<StatsPullerManager> pullerManager = new StatsPullerManager();
sp<AlarmMonitor> anomalyAlarmMonitor; sp<AlarmMonitor> anomalyAlarmMonitor;
sp<AlarmMonitor> subscriberAlarmMonitor; sp<AlarmMonitor> subscriberAlarmMonitor;
// 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( StatsLogProcessor p(
m, pullerManager, anomalyAlarmMonitor, subscriberAlarmMonitor, 0, m, pullerManager, anomalyAlarmMonitor, subscriberAlarmMonitor, 0,
[](const ConfigKey& key) { return true; }, [](const ConfigKey& key) { return true; },