PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Change getStatsStartRealtime to getStatsStartTimestamp" into sc-dev am: 5cc7c7c1de

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13955156

Change-Id: I16b44fc5aea9bd66d28a96ec05f9d4e88d37f103
This commit is contained in:
Dmitri Plotnikov
2021-03-24 00:59:44 +00:00
committed by Automerger Merge Worker
parent 70ee5dd130 5cc7c7c1de
commit f2c66754b9
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/fuelgauge/BatteryUtils.java
View File

@@ -298,7 +298,7 @@ public class BatteryUtils {
*/ */
public long calculateLastFullChargeTime(BatteryUsageStats batteryUsageStats, public long calculateLastFullChargeTime(BatteryUsageStats batteryUsageStats,
long currentTimeMs) { long currentTimeMs) {
return currentTimeMs - batteryUsageStats.getStatsStartRealtime(); return currentTimeMs - batteryUsageStats.getStatsStartTimestamp();
} }
public static void logRuntime(String tag, String message, long startTime) { public static void logRuntime(String tag, String message, long startTime) {

2
tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java
View File

@@ -277,7 +277,7 @@ public class BatteryUtilsTest {
@Test @Test
public void testCalculateLastFullChargeTime() { public void testCalculateLastFullChargeTime() {
final long currentTimeMs = System.currentTimeMillis(); final long currentTimeMs = System.currentTimeMillis();
when(mBatteryUsageStats.getStatsStartRealtime()).thenReturn( when(mBatteryUsageStats.getStatsStartTimestamp()).thenReturn(
currentTimeMs - TIME_SINCE_LAST_FULL_CHARGE_MS); currentTimeMs - TIME_SINCE_LAST_FULL_CHARGE_MS);
assertThat(mBatteryUtils.calculateLastFullChargeTime(mBatteryUsageStats, currentTimeMs)) assertThat(mBatteryUtils.calculateLastFullChargeTime(mBatteryUsageStats, currentTimeMs))