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

Commit f2d57027 authored by Benjamin Schwartz's avatar Benjamin Schwartz Committed by Automerger Merge Worker
Browse files

Merge "power/stats: Correct language surrounding timestamps" am: 75d7e5de 

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1703725

Change-Id: I36c4fd2ebbd4469cacd18c60b92c4c7d832bd17c
parents 1d5c701a 75d7e5de

power/stats/aidl/android/hardware/power/stats/EnergyConsumerResult.aidl

+1 −2
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ parcelable EnergyConsumerResult { 
     */

    int id;

    /**

     * Time since boot in milliseconds

     * Time of data capture in milliseconds since boot (CLOCK_BOOTTIME clock)

     */

    long timestampMs;

    /**
@@ -38,4 +38,3 @@ parcelable EnergyConsumerResult { 
     */

    EnergyConsumerAttribution[] attribution;

}

power/stats/aidl/android/hardware/power/stats/EnergyMeasurement.aidl

+1 −2
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ parcelable EnergyMeasurement { 
     */

    int id;

    /**

     * Approximate time of data capture in millseconds since boot

     * Time of data capture in milliseconds since boot (CLOCK_BOOTTIME clock)

     */

    long timestampMs;

    /**
@@ -35,4 +35,3 @@ parcelable EnergyMeasurement { 
     */

    long energyUWs;

}