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

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

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

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

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

Change-Id: Id55555fa6d71fdd8fc177d156c479090252e47b0
parents 75d290bd 1aaf18b6

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

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

     */

    int id;

    int id;

    /**

    /**

     * Time since boot in milliseconds

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

     */

     */

    long timestampMs;

    long timestampMs;

    /**

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

     */

    EnergyConsumerAttribution[] attribution;

    EnergyConsumerAttribution[] attribution;

}
 
}

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

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

     */

    int id;

    int id;

    /**

    /**

     * Approximate time of data capture in millseconds since boot

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

     */

     */

    long timestampMs;

    long timestampMs;

    /**

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

     */

    long energyUWs;

    long energyUWs;

}
 
}