Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix some obvious typos and copy-paste bugs." am: 1cfd0c7546 am: b78ad69fa0 am: 9378d318f4

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1851673

Change-Id: I6023e92cb9c6b338f96fbb85c9df51b81286e0a1
This commit is contained in:
Donald Chai
2021-11-10 22:24:56 +00:00
committed by Automerger Merge Worker
parent eb937f4dc2 9378d318f4
commit 13b24677c2
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/os/health/HealthStats.java
View File

@@ -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

6
core/java/android/os/health/UidHealthStats.java
View File

@@ -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)