summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Misha Wagner <mishaw@google.com> 2018-11-27 06:59:11 -0800
committer android-build-merger <android-build-merger@google.com> 2018-11-27 06:59:11 -0800
commit3673e7ff91a8f86ccdf9ff7cda064f1cee0acc12 (patch)
tree7bccf88f44c2857965ac667b0f7c73bf1e6853a2
parent060248c3f94a21434291c60aaf0b4c608e7a0a80 (diff)
parent85980756b446775ebb394fab2be668aef2d51fb5 (diff)
Merge "Fix issue in CpuTimePerUid where microseconds are used as milliseconds" am: 4314aef811 am: f7905eb419
am: 85980756b4 Change-Id: If1338ca0d87160a79eea251e8c2c87b5b55df980
-rw-r--r--cmds/statsd/src/atoms.proto4
1 files changed, 2 insertions, 2 deletions
diff --git a/cmds/statsd/src/atoms.proto b/cmds/statsd/src/atoms.proto
index 3ee0a06e2cd8..ada5d4c3148c 100644
--- a/cmds/statsd/src/atoms.proto
+++ b/cmds/statsd/src/atoms.proto
@@ -2421,8 +2421,8 @@ message CpuTimePerFreq {
*/
message CpuTimePerUid {
optional int32 uid = 1 [(is_uid) = true];
- optional uint64 user_time_millis = 2;
- optional uint64 sys_time_millis = 3;
+ optional uint64 user_time_micros = 2;
+ optional uint64 sys_time_micros = 3;
}
/**