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

Commit 3df3fecd authored by Yao Chen's avatar Yao Chen Committed by android-build-merger
Browse files

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

am: 3991138f

Change-Id: I4ecef0bd8cf40c0a10008bcd1ff38556cfecc160
parents a86a5b33 3991138f

cmds/statsd/src/matchers/matcher_util.cpp

+2 −2
Original line number Diff line number Diff line
@@ -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()) {

cmds/statsd/src/statsd_config.proto

+1 −1
Original line number Diff line number Diff line
@@ -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;

  }

}

cmds/statsd/tests/LogEntryMatcher_test.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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");