From bee44ae8e5da109cd8273a057b566dc6925d6a71 Mon Sep 17 00:00:00 2001 From: Joe Onorato Date: Tue, 19 Apr 2016 11:02:26 -0700 Subject: 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 --- core/java/android/os/health/UidHealthStats.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'core/java/android') 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 -- cgit v1.2.3