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

Merge "Fix legacy failed unit test for BatteryInfoLoader" into sc-dev am: 10559fb9de

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

Change-Id: I8e4cbfb8ac88d765325c4f2a8131aa714631d180
This commit is contained in:
YUKAI HUNG
2021-05-17 13:38:41 +00:00
committed by Automerger Merge Worker
parent d5c5b6606d 10559fb9de
commit c0ab21eaa3
3 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/fuelgauge/BatteryDiffEntry.java
View File

@@ -73,6 +73,11 @@ public class BatteryDiffEntry {
mBackgroundUsageTimeInMs = backgroundUsageTimeInMs; mBackgroundUsageTimeInMs = backgroundUsageTimeInMs;
mBatteryHistEntry = batteryHistEntry; mBatteryHistEntry = batteryHistEntry;
mUserManager = context.getSystemService(UserManager.class); 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. */ /** Sets the total consumed power in a specific time slot. */

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

@@ -230,7 +230,7 @@ public final class ConvertUtils {
if (selectedBatteryEntry == null) { if (selectedBatteryEntry == null) {
continue; 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. // error since we will apply the interpolation arithmetic.
final float totalUsageTimeInMs = final float totalUsageTimeInMs =
foregroundUsageTimeInMs + backgroundUsageTimeInMs; foregroundUsageTimeInMs + backgroundUsageTimeInMs;

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

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