Merge "Mark fields 100/101 as reserved" into rvc-dev (7131aa36) · Commits · e / os / android_frameworks_base

cmds/statsd/src/statsd_config.proto

+15 −0

Original line number	Diff line number	Diff line
		@@ -198,6 +198,9 @@ message EventMetric {
		optional int64 condition = 3;

		repeated MetricConditionLink links = 4;

		reserved 100;
		reserved 101;
		}

		message CountMetric {
		@@ -218,6 +221,9 @@ message CountMetric {
		repeated MetricStateLink state_link = 9;

		optional FieldMatcher dimensions_in_condition = 7 [deprecated = true];

		reserved 100;
		reserved 101;
		}

		message DurationMetric {
		@@ -245,6 +251,9 @@ message DurationMetric {
		optional TimeUnit bucket = 7;

		optional FieldMatcher dimensions_in_condition = 8 [deprecated = true];

		reserved 100;
		reserved 101;
		}

		message GaugeMetric {
		@@ -281,6 +290,9 @@ message GaugeMetric {
		optional int32 max_pull_delay_sec = 13 [default = 30];

		optional bool split_bucket_for_app_upgrade = 14 [default = true];

		reserved 100;
		reserved 101;
		}

		message ValueMetric {
		@@ -333,6 +345,9 @@ message ValueMetric {
		optional bool split_bucket_for_app_upgrade = 17 [default = true];

		optional FieldMatcher dimensions_in_condition = 9 [deprecated = true];

		reserved 100;
		reserved 101;
		}

		message Alert {