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

DO NOT MERGE resolve merge conflicts of 872009a3bc to qt-qpr1-dev-plus-aosp

Browse Source 
Test: I solemnly swear I tested this conflict resolution.
Bug: None
Change-Id: Ia40303aa2a669c301fab912b0b0bdf5ec1259caf
This commit is contained in:
Hector Dearman
2019-12-04 13:42:41 +00:00
parent 1bad2fbc50 872009a3bc
commit f35827bc17
1 changed files with 36 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
cmds/statsd/src/atoms.proto
View File

@@ -324,6 +324,8 @@ message Atom {
AppCompatibilityChangeReported app_compatibility_change_reported =
228 [(allow_from_any_uid) = true];
PerfettoUploaded perfetto_uploaded =
229 [(log_from_module) = "perfetto"];
VmsClientConnectionStateChanged vms_client_connection_state_changed = 230;
}
@@ -6887,6 +6889,40 @@ message AppCompatibilityChangeReported {
optional Source source = 4;
}
/**
* Logged from
* external/perfetto/src/perfetto_cmd/perfetto_cmd.cc
*/
message PerfettoUploaded {
enum Event {
PERFETTO_UNDEFINED = 0;
PERFETTO_TRACE_BEGIN = 1;
PERFETTO_BACKGROUND_TRACE_BEGIN = 2;
PERFETTO_ON_CONNECT = 3;
PERFETTO_ON_TRACING_DISABLED = 4;
PERFETTO_UPLOAD_DROPBOX_BEGIN = 5;
PERFETTO_UPLOAD_DROPBOX_SUCCESS = 6;
PERFETTO_UPLOAD_DROPBOX_FAILURE = 7;
PERFETTO_UPLOAD_INCIDENT_BEGIN = 8;
PERFETTO_UPLOAD_INCIDENT_SUCCESS = 9;
PERFETTO_UPLOAD_INCIDENT_FAILURE = 10;
PERFETTO_FINALIZE_TRACE_AND_EXIT = 11;
PERFETTO_TRIGGER_BEGIN = 12;
PERFETTO_TRIGGER_SUCCESS = 13;
PERFETTO_TRIGGER_FAILURE = 14;
PERFETTO_HIT_GUARDRAILS = 15;
PERFETTO_ON_TIMEOUT = 16;
PERFETTO_NOT_UPLOADING_EMPTY_TRACE = 17;
}
// Which stage of the pipeline we are reporting from.
optional Event event = 1;
// UUID matching the one set inside the SystemInfo trace packet.
optional int64 trace_uuid_lsb = 2;
optional int64 trace_uuid_msb = 3;
}
/**
* Pulls client metrics on data transferred via Vehicle Maps Service.
* Metrics are keyed by uid + layer.