summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorJoe Onorato <joeo@google.com>2016-04-19 11:02:26 -0700
committerJoe Onorato <joeo@google.com>2016-04-19 11:27:05 -0700
commitbee44ae8e5da109cd8273a057b566dc6925d6a71 (patch)
tree583306389d40448d55700bcc63daeb5f8203e56f /core/java
parentadfa806cfbd6ad51fe3ec8c4cea808ebd2967038 (diff)
Consolidate the HealthStats UI to only use milliseconds.
BatteryStats uses a mix of microseconds and milliseconds, and keeping which one is which straight is difficult. The internal bookkeeping is left using us where it already does, for the extra precision. But having the API be mixed will only make it harder for developers, and lead them to make the same mistake that I did in the API where I missed some conversions. Bug: 28197858 Change-Id: I99114bae259b9bdd47ce5c22e724d87bbd63336d
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/os/health/UidHealthStats.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/core/java/android/os/health/UidHealthStats.java b/core/java/android/os/health/UidHealthStats.java
index c7d257fcaa42..337235a38bde 100644
--- a/core/java/android/os/health/UidHealthStats.java
+++ b/core/java/android/os/health/UidHealthStats.java
@@ -261,16 +261,16 @@ public final class UidHealthStats {
public static final int TIMER_MOBILE_RADIO_ACTIVE = HealthKeys.BASE_UID + 61;
@HealthKeys.Constant(type=HealthKeys.TYPE_MEASUREMENT)
- public static final int MEASUREMENT_USER_CPU_TIME_US = HealthKeys.BASE_UID + 62;
+ public static final int MEASUREMENT_USER_CPU_TIME_MS = HealthKeys.BASE_UID + 62;
@HealthKeys.Constant(type=HealthKeys.TYPE_MEASUREMENT)
- public static final int MEASUREMENT_SYSTEM_CPU_TIME_US = HealthKeys.BASE_UID + 63;
+ public static final int MEASUREMENT_SYSTEM_CPU_TIME_MS = HealthKeys.BASE_UID + 63;
/**
* An estimate of the number of milliamp-microsends used by this uid.
*/
@HealthKeys.Constant(type=HealthKeys.TYPE_MEASUREMENT)
- public static final int MEASUREMENT_CPU_POWER_MAUS = HealthKeys.BASE_UID + 64;
+ public static final int MEASUREMENT_CPU_POWER_MAMS = HealthKeys.BASE_UID + 64;
/**
* @hide