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

Merge "rename neq_all_string to neq_any_string in statsd_config" into pi-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2018-03-23 21:15:02 +00:00
committed by Android (Google) Code Review
parent 4cd95f64c2 d50f2ae487
commit 3991138f3a
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmds/statsd/src/matchers/matcher_util.cpp
View File

@@ -236,8 +236,8 @@ bool matchesSimple(const UidMap& uidMap, const FieldValueMatcher& matcher,
}
return false;
}
case FieldValueMatcher::ValueMatcherCase::kNeqAllString: {
const auto& str_list = matcher.neq_all_string();
case FieldValueMatcher::ValueMatcherCase::kNeqAnyString: {
const auto& str_list = matcher.neq_any_string();
for (int i = start; i < end; i++) {
bool notEqAll = true;
for (const auto& str : str_list.str_value()) {

2
cmds/statsd/src/statsd_config.proto
View File

@@ -78,7 +78,7 @@ message FieldValueMatcher {
MessageMatcher matches_tuple = 12;
StringListMatcher eq_any_string = 13;
StringListMatcher neq_all_string = 14;
StringListMatcher neq_any_string = 14;
}
}

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

@@ -339,7 +339,7 @@ TEST(AtomMatcherTest, TestNeqAnyStringMatcher) {
ATTRIBUTION_UID_FIELD_ID);
auto neqStringList = attributionMatcher->mutable_matches_tuple()
->mutable_field_value_matcher(0)
->mutable_neq_all_string();
->mutable_neq_any_string();
neqStringList->add_str_value("pkg2");
neqStringList->add_str_value("pkg3");