Merge "Fix legacy failed unit test for BatteryInfoLoader" into sc-dev
diff --git a/src/com/android/settings/fuelgauge/BatteryDiffEntry.java b/src/com/android/settings/fuelgauge/BatteryDiffEntry.java
index 7b73638..81ad5be 100644
--- a/src/com/android/settings/fuelgauge/BatteryDiffEntry.java
+++ b/src/com/android/settings/fuelgauge/BatteryDiffEntry.java
@@ -73,6 +73,11 @@
mBackgroundUsageTimeInMs = backgroundUsageTimeInMs;
mBatteryHistEntry = batteryHistEntry;
mUserManager = context.getSystemService(UserManager.class);
+ if (foregroundUsageTimeInMs == 0
+ && backgroundUsageTimeInMs == 0
+ && consumePower != 0) {
+ Log.w(TAG, "abnornal BatteryDiffEntry:\n" + this);
+ }
}
/** Sets the total consumed power in a specific time slot. */
diff --git a/src/com/android/settings/fuelgauge/ConvertUtils.java b/src/com/android/settings/fuelgauge/ConvertUtils.java
index 37f9e12..e05247c 100644
--- a/src/com/android/settings/fuelgauge/ConvertUtils.java
+++ b/src/com/android/settings/fuelgauge/ConvertUtils.java
@@ -230,7 +230,7 @@
if (selectedBatteryEntry == null) {
continue;
}
- // Force refine the cumulative value since it may introduce deviation
+ // Forces refine the cumulative value since it may introduce deviation
// error since we will apply the interpolation arithmetic.
final float totalUsageTimeInMs =
foregroundUsageTimeInMs + backgroundUsageTimeInMs;
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoLoaderTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoLoaderTest.java
index 5bcaf0a..0dfabb9 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoLoaderTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoLoaderTest.java
@@ -78,6 +78,6 @@
BatteryInfo info = loader.loadInBackground();
assertThat(info.remainingLabel).isNotNull();
- assertThat(info.remainingTimeUs).isEqualTo(TEST_TIME_REMAINING);
+ assertThat(info.remainingTimeUs).isEqualTo(TEST_TIME_REMAINING * 1000);
}
}