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

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

Merge "Sync proto from google3"

parents d28ce0e9 a81a0ffa

cmds/statsd/src/statsd_config.proto

+1 −1
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ message SimpleCondition { 
    UNKNOWN = 0;

    FALSE = 1;

  }

  optional InitialValue initial_value = 5 [default = UNKNOWN];

  optional InitialValue initial_value = 5 [default = FALSE];



  repeated KeyMatcher dimension = 6;

}

cmds/statsd/tests/condition/SimpleConditionTracker_test.cpp

+1 −0
Original line number Diff line number Diff line
@@ -70,6 +70,7 @@ TEST(SimpleConditionTrackerTest, TestNonSlicedCondition) { 
    simpleCondition.set_start("SCREEN_TURNED_ON");

    simpleCondition.set_stop("SCREEN_TURNED_OFF");

    simpleCondition.set_count_nesting(false);

    simpleCondition.set_initial_value(SimpleCondition_InitialValue_UNKNOWN);



    unordered_map<string, int> trackerNameIndexMap;

    trackerNameIndexMap["SCREEN_TURNED_ON"] = 0;