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

Merge "Report High usage even in a short period"

Browse Source
This commit is contained in:
TreeHugger Robot
2018-02-26 23:00:22 +00:00
committed by Android (Google) Code Review
parent c3bc3bc690 5f28beac51
commit d89e9c2e24
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/fuelgauge/batterytip/HighUsageDataParser.java
View File

@@ -51,7 +51,7 @@ public class HighUsageDataParser implements BatteryInfo.BatteryDataParser {
@Override
public void onDataPoint(long time, BatteryStats.HistoryItem record) {
if (record.currentTime <= mEndTimeMs - mTimePeriodMs) {
if (time == 0 || record.currentTime <= mEndTimeMs - mTimePeriodMs) {
// Since onDataPoint is invoked sorted by time, so we could use this way to get the
// closet battery level 'mTimePeriodMs' time ago.
mLastPeriodBatteryLevel = record.batteryLevel;

11
tests/robotests/src/com/android/settings/fuelgauge/batterytip/HighUsageDataParserTest.java
View File

@@ -36,6 +36,7 @@ import java.time.Duration;
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class HighUsageDataParserTest {
private static final long PERIOD_ONE_MINUTE_MS = Duration.ofMinutes(1).toMillis();
private static final long PERIOD_ONE_HOUR_MS = Duration.ofHours(1).toMillis();
private static final long END_TIME_MS = 2 * PERIOD_ONE_MINUTE_MS;
private static final int THRESHOLD_LOW = 10;
private static final int THRESHOLD_HIGH = 20;
@@ -75,7 +76,17 @@ public class HighUsageDataParserTest {
assertThat(mDataParser.isDeviceHeavilyUsed()).isFalse();
}
@Test
public void testDataParser_heavilyUsedInShortTime_stillReportHeavilyUsed() {
// Set threshold to 1 hour however device only used for 2 minutes
mDataParser = new HighUsageDataParser(PERIOD_ONE_HOUR_MS, THRESHOLD_LOW);
parseData();
assertThat(mDataParser.isDeviceHeavilyUsed()).isTrue();
}
private void parseData() {
// Report the battery usage in END_TIME_MS(2 minutes)
mDataParser.onParsingStarted(0, END_TIME_MS);
mDataParser.onDataPoint(0, mFirstItem);
mDataParser.onDataPoint(PERIOD_ONE_MINUTE_MS, mSecondItem);