summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorDonald Chai <dchai@google.com>2021-11-10 21:46:24 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-11-10 21:46:24 +0000
commitb78ad69fa0da7ace68daff771cf7583ed208d2b5 (patch)
tree84f5c091f4c29eecb592d41bad3dc96fd15fe9e4 /core/java/android
parent4c669c66859d7f5a6d574d3cca9144072013047d (diff)
parent1cfd0c754664631ed2371e7d98d4b98b19d7363e (diff)
Merge "Fix some obvious typos and copy-paste bugs." am: 1cfd0c7546
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1851673 Change-Id: I3274da8750b5df89c1171cfa97827a7f64e140cb
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/os/health/HealthStats.java2
-rw-r--r--core/java/android/os/health/UidHealthStats.java6
2 files changed, 4 insertions, 4 deletions
diff --git a/core/java/android/os/health/HealthStats.java b/core/java/android/os/health/HealthStats.java
index 74ce5157a548..6c648f136183 100644
--- a/core/java/android/os/health/HealthStats.java
+++ b/core/java/android/os/health/HealthStats.java
@@ -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
diff --git a/core/java/android/os/health/UidHealthStats.java b/core/java/android/os/health/UidHealthStats.java
index afc9d78dcbd1..488a5422becc 100644
--- a/core/java/android/os/health/UidHealthStats.java
+++ b/core/java/android/os/health/UidHealthStats.java
@@ -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)