Merge "Fix legacy failed unit test for BatteryInfoLoader" into sc-dev

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

@@ -73,6 +73,11 @@ public class BatteryDiffEntry {
         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. */

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

@@ -230,7 +230,7 @@ public final class ConvertUtils {
                 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;

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

@@ -78,6 +78,6 @@ public class BatteryInfoLoaderTest {
         BatteryInfo info = loader.loadInBackground();
 
         assertThat(info.remainingLabel).isNotNull();
-        assertThat(info.remainingTimeUs).isEqualTo(TEST_TIME_REMAINING);
+        assertThat(info.remainingTimeUs).isEqualTo(TEST_TIME_REMAINING * 1000);
     }
 }