diff options
| author | Donald Chai <dchai@google.com> | 2021-11-10 23:04:50 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-11-10 23:04:50 +0000 |
| commit | a67a24511141da1ce54e7ce60fba7c3d6fd15a3a (patch) | |
| tree | a233f53cc5d0989e2d0ee0e1646fb132a3c40028 /core/java/android | |
| parent | f0b2d8e3835d37519839b446a068d60a2114ebb7 (diff) | |
| parent | b5217cf799e92c3dd6707f8ce8e02ba84a9a203f (diff) | |
Merge "Fix some obvious typos and copy-paste bugs." am: 1cfd0c7546 am: b78ad69fa0 am: 9378d318f4 am: 13b24677c2 am: b5217cf799
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1851673
Change-Id: Ic3f9eea675bc6c17eca035146b0fc948846191f3
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/os/health/HealthStats.java | 2 | ||||
| -rw-r--r-- | core/java/android/os/health/UidHealthStats.java | 6 |
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) |