Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b78ad69f authored by Donald Chai's avatar Donald Chai Committed by Automerger Merge Worker
Browse files

Merge "Fix some obvious typos and copy-paste bugs." am: 1cfd0c75 

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

Change-Id: I3274da8750b5df89c1171cfa97827a7f64e140cb
parents 4c669c66 1cfd0c75

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

core/java/android/os/health/UidHealthStats.java

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