Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 85980756 authored by Misha Wagner's avatar Misha Wagner Committed by android-build-merger
Browse files

Merge "Fix issue in CpuTimePerUid where microseconds are used as milliseconds" am: 4314aef8

am: f7905eb4

Change-Id: I78470d6cc8e6e42adc50407f04b0294b9b1e159a
parents 7fb4f33d f7905eb4
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -1813,8 +1813,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;
}

/**