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

Merge "Sync proto from google3"

Browse Source
This commit is contained in:
TreeHugger Robot
2017-11-21 19:16:21 +00:00
committed by Android (Google) Code Review
parent d28ce0e9e4 a81a0ffa52
commit a82d460baf
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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;
}

1
cmds/statsd/tests/condition/SimpleConditionTracker_test.cpp
View File

@@ -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;