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

Commit 5cc7c7c1 authored by Dmitri Plotnikov's avatar Dmitri Plotnikov Committed by Android (Google) Code Review
Browse files

Merge "Change getStatsStartRealtime to getStatsStartTimestamp" into sc-dev

parents d8c9a539 3b5c5f0d

src/com/android/settings/fuelgauge/BatteryUtils.java

+1 −1
Original line number Diff line number Diff line
@@ -298,7 +298,7 @@ public class BatteryUtils { 
     */

    public long calculateLastFullChargeTime(BatteryUsageStats batteryUsageStats,

            long currentTimeMs) {

        return currentTimeMs - batteryUsageStats.getStatsStartRealtime();

        return currentTimeMs - batteryUsageStats.getStatsStartTimestamp();

    }



    public static void logRuntime(String tag, String message, long startTime) {

tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java

+1 −1
Original line number Diff line number Diff line
@@ -277,7 +277,7 @@ public class BatteryUtilsTest { 
    @Test

    public void testCalculateLastFullChargeTime() {

        final long currentTimeMs = System.currentTimeMillis();

        when(mBatteryUsageStats.getStatsStartRealtime()).thenReturn(

        when(mBatteryUsageStats.getStatsStartTimestamp()).thenReturn(

                currentTimeMs - TIME_SINCE_LAST_FULL_CHARGE_MS);



        assertThat(mBatteryUtils.calculateLastFullChargeTime(mBatteryUsageStats, currentTimeMs))