From 3b5c5f0d7c0e3e2b70d11992fed87dd31c0e1a02 Mon Sep 17 00:00:00 2001 From: Dmitri Plotnikov Date: Mon, 22 Mar 2021 15:51:21 -0700 Subject: [PATCH] Change getStatsStartRealtime to getStatsStartTimestamp Bug: 183434301 Test: make RunSettingsRoboTests Test: make RunSettingsGoogleRoboTests Change-Id: Ic86a04a91d910c863706a0f799c757dcd7c5262d --- src/com/android/settings/fuelgauge/BatteryUtils.java | 2 +- .../src/com/android/settings/fuelgauge/BatteryUtilsTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/com/android/settings/fuelgauge/BatteryUtils.java b/src/com/android/settings/fuelgauge/BatteryUtils.java index 16455905ce7..68a0b033f1a 100644 --- a/src/com/android/settings/fuelgauge/BatteryUtils.java +++ b/src/com/android/settings/fuelgauge/BatteryUtils.java @@ -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) { diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java index 775ca4015a1..744db8c4e97 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java @@ -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))