Merge "Fix some obvious typos and copy-paste bugs." (1cfd0c75) · Commits · e / os / android_frameworks_base

core/java/android/os/health/HealthStats.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -32,7 +32,7 @@ import java.util.Map;
		* Each of the keys references data in one of five data types:
		*
		* <p>
		* A <b>measurement</b> metric contains a sinlge {@code long} value. That value may
		* A <b>measurement</b> metric contains a single {@code long} value. That value may
		* be a count, a time, or some other type of value. The unit for a measurement
		* (COUNT, MS, etc) will always be in the name of the constant for the key to
		* retrieve it. For example, the

+3 −3

Original line number	Diff line number	Diff line
		@@ -43,14 +43,14 @@ public final class UidHealthStats {

		/**
		* How many milliseconds this statistics report covers in wall-clock time while the
		* device was on battery including both screen-on and screen-off time.
		* device was on battery including only screen-off time.
		*/
		@HealthKeys.Constant(type=HealthKeys.TYPE_MEASUREMENT)
		public static final int MEASUREMENT_REALTIME_SCREEN_OFF_BATTERY_MS = HealthKeys.BASE_UID + 3;

		/**
		* How many milliseconds this statistics report covers that the CPU was running while the
		* device was on battery including both screen-on and screen-off time.
		* device was on battery including only screen-off time.
		*/
		@HealthKeys.Constant(type=HealthKeys.TYPE_MEASUREMENT)
		public static final int MEASUREMENT_UPTIME_SCREEN_OFF_BATTERY_MS = HealthKeys.BASE_UID + 4;
		@@ -65,7 +65,7 @@ public final class UidHealthStats {

		/**
		* Key for a TimerStat for the times a
		* {@link android.os.PowerManager#PARTIAL_WAKE_LOCK full wake lock}
		* {@link android.os.PowerManager#PARTIAL_WAKE_LOCK partial wake lock}
		* was acquired for this uid.
		*/
		@HealthKeys.Constant(type=HealthKeys.TYPE_TIMERS)