Merge "Sync statsd google3 protos to aosp." (411985ba) · Commits · e / os / android_frameworks_base

cmds/statsd/src/statsd_config.proto

+170 −167

Original line number	Original line	Diff line number	Diff line
	@@ -26,8 +26,11 @@ import "frameworks/base/cmds/statsd/src/perfetto/perfetto_config.proto";

	enum Position {		enum Position {
	POSITION_UNKNOWN = 0;		POSITION_UNKNOWN = 0;

	FIRST = 1;		FIRST = 1;

	LAST = 2;		LAST = 2;

	ANY = 3;		ANY = 3;
	}		}

	@@ -54,13 +57,8 @@ message FieldMatcher {
	}		}

	message FieldValueMatcher {		message FieldValueMatcher {
	// Field id, as specified in the atom proto message.
	optional int32 field = 1;		optional int32 field = 1;

	// For repeated fields, specifies the position in the array.
	// FIRST and LAST mean that if the values are found at the first
	// or last position, it's a match. ANY means that if the values are found
	// anywhere in the array, then it's a match.
	optional Position position = 2;		optional Position position = 2;

	oneof value_matcher {		oneof value_matcher {
	@@ -146,10 +144,6 @@ message Predicate {
	}		}
	}		}

	message Bucket {
	optional int64 bucket_size_millis = 1;
	}

	message MetricConditionLink {		message MetricConditionLink {
	optional int64 condition = 1;		optional int64 condition = 1;

	@@ -247,7 +241,9 @@ message ValueMetric {

	repeated MetricConditionLink links = 7;		repeated MetricConditionLink links = 7;

	enum AggregationType { SUM = 1; }		enum AggregationType {
			SUM = 1;
			}
	optional AggregationType aggregation_type = 8 [default = SUM];		optional AggregationType aggregation_type = 8 [default = SUM];
	}		}

	@@ -265,7 +261,9 @@ message Alert {

	message Alarm {		message Alarm {
	optional int64 id = 1;		optional int64 id = 1;

	optional int64 offset_millis = 2;		optional int64 offset_millis = 2;

	optional int64 period_millis = 3;		optional int64 period_millis = 3;
	}		}

	@@ -277,6 +275,10 @@ message PerfettoDetails {
	optional perfetto.protos.TraceConfig trace_config = 1;		optional perfetto.protos.TraceConfig trace_config = 1;
	}		}

			message BroadcastSubscriberDetails {
			optional int64 subscriber_id = 1;
			}

	message Subscription {		message Subscription {
	optional int64 id = 1;		optional int64 id = 1;

	@@ -292,6 +294,7 @@ message Subscription {
	oneof subscriber_information {		oneof subscriber_information {
	IncidentdDetails incidentd_details = 4;		IncidentdDetails incidentd_details = 4;
	PerfettoDetails perfetto_details = 5;		PerfettoDetails perfetto_details = 5;
			BroadcastSubscriberDetails broadcast_subscriber_details = 6;
	}		}
	}		}

cmds/statsd/tools/loadtest/src/com/android/statsd/loadtest/ConfigFactory.java

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -19,7 +19,6 @@ import android.content.Context;
	import android.content.res.Resources;		import android.content.res.Resources;
	import android.util.Log;		import android.util.Log;

	import com.android.internal.os.StatsdConfigProto.Bucket;
	import com.android.internal.os.StatsdConfigProto.Predicate;		import com.android.internal.os.StatsdConfigProto.Predicate;
	import com.android.internal.os.StatsdConfigProto.CountMetric;		import com.android.internal.os.StatsdConfigProto.CountMetric;
	import com.android.internal.os.StatsdConfigProto.DurationMetric;		import com.android.internal.os.StatsdConfigProto.DurationMetric;

cmds/statsd/src/stats_log.proto

+62 −62

File changed.

Contains only whitespace changes.