commit 5cc7c7c1deb99100db3ddd3986562d3e07f190f4
author Dmitri Plotnikov <dplotnikov@google.com> Tue Mar 23 17:29:35 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Mar 23 17:29:35 2021 +0000
tree 88516d093981f7b6de3eb2929f333723873827b9
parent d8c9a53931fcff9240272011aa9f32a29a1f56a9
parent 3b5c5f0d7c0e3e2b70d11992fed87dd31c0e1a02

Merge "Change getStatsStartRealtime to getStatsStartTimestamp" into sc-dev

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

diff --git a/src/com/android/settings/fuelgauge/BatteryUtils.java b/src/com/android/settings/fuelgauge/BatteryUtils.java
index 1645590..68a0b03 100644
--- a/src/com/android/settings/fuelgauge/BatteryUtils.java
+++ b/src/com/android/settings/fuelgauge/BatteryUtils.java
@@ -298,7 +298,7 @@
      */
     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

diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java
index 775ca40..744db8c 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 @@
     @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))