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

Fix incorrect field ID for is_active in stats_log

Browse Source 
field number 13 in stats_log.proto conflicts with a copy in google3/

Bug: 121035918
Test: stats_test
Change-Id: Iadc3a5c227bb361553ba2bee2534cc767d34d7a3
This commit is contained in:
Howard Ro
2018-12-16 19:15:21 -08:00
parent b4ee870eca
commit 9440e09687
6 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -49,7 +49,7 @@ const int FIELD_ID_TIME_BASE = 9;
const int FIELD_ID_BUCKET_SIZE = 10;
const int FIELD_ID_DIMENSION_PATH_IN_WHAT = 11;
const int FIELD_ID_DIMENSION_PATH_IN_CONDITION = 12;
const int FIELD_ID_IS_ACTIVE = 13;
const int FIELD_ID_IS_ACTIVE = 14;
// for CountMetricDataWrapper
const int FIELD_ID_DATA = 1;

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

@@ -48,7 +48,7 @@ const int FIELD_ID_TIME_BASE = 9;
const int FIELD_ID_BUCKET_SIZE = 10;
const int FIELD_ID_DIMENSION_PATH_IN_WHAT = 11;
const int FIELD_ID_DIMENSION_PATH_IN_CONDITION = 12;
const int FIELD_ID_IS_ACTIVE = 13;
const int FIELD_ID_IS_ACTIVE = 14;
// for DurationMetricDataWrapper
const int FIELD_ID_DATA = 1;
// for DurationMetricData

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

@@ -44,7 +44,7 @@ namespace statsd {
// for StatsLogReport
const int FIELD_ID_ID = 1;
const int FIELD_ID_EVENT_METRICS = 4;
const int FIELD_ID_IS_ACTIVE = 13;
const int FIELD_ID_IS_ACTIVE = 14;
// for EventMetricDataWrapper
const int FIELD_ID_DATA = 1;
// for EventMetricData

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

@@ -49,7 +49,7 @@ const int FIELD_ID_TIME_BASE = 9;
const int FIELD_ID_BUCKET_SIZE = 10;
const int FIELD_ID_DIMENSION_PATH_IN_WHAT = 11;
const int FIELD_ID_DIMENSION_PATH_IN_CONDITION = 12;
const int FIELD_ID_IS_ACTIVE = 13;
const int FIELD_ID_IS_ACTIVE = 14;
// for GaugeMetricDataWrapper
const int FIELD_ID_DATA = 1;
const int FIELD_ID_SKIPPED = 2;

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

@@ -52,7 +52,7 @@ const int FIELD_ID_TIME_BASE = 9;
const int FIELD_ID_BUCKET_SIZE = 10;
const int FIELD_ID_DIMENSION_PATH_IN_WHAT = 11;
const int FIELD_ID_DIMENSION_PATH_IN_CONDITION = 12;
const int FIELD_ID_IS_ACTIVE = 13;
const int FIELD_ID_IS_ACTIVE = 14;
// for ValueMetricDataWrapper
const int FIELD_ID_DATA = 1;
const int FIELD_ID_SKIPPED = 2;

4
cmds/statsd/src/stats_log.proto
View File

@@ -220,7 +220,9 @@ message StatsLogReport {
optional DimensionsValue dimensions_path_in_condition = 12;
optional bool is_active = 13;
// DO NOT USE field 13.
optional bool is_active = 14;
}
message UidMapping {