commit 809db7a37cacfa1a1ba9ef95b9929c87734914b7
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Feb 27 00:08:16 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Feb 27 00:08:16 2018 +0000
tree 148905770ec13cc90bafa27824002034726a137c
parent d89e9c2e240e1d51efa74c56ed5e36e4d2a8ca41
parent 220b6e2331b16ed3d4dcbdec1aff7b7cdfabb2b9

Merge "Fix PictureInPictureSettingsTest."

src/com/android/settings/fuelgauge/batterytip/HighUsageDataParser.java

diff --git a/src/com/android/settings/fuelgauge/batterytip/HighUsageDataParser.java b/src/com/android/settings/fuelgauge/batterytip/HighUsageDataParser.java
index cc5aed6..d5710c2 100644
--- a/src/com/android/settings/fuelgauge/batterytip/HighUsageDataParser.java
+++ b/src/com/android/settings/fuelgauge/batterytip/HighUsageDataParser.java
@@ -51,7 +51,7 @@
 
     @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;

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

diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/HighUsageDataParserTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/HighUsageDataParserTest.java
index 5bdae0c..fdac12e 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/HighUsageDataParserTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/HighUsageDataParserTest.java
@@ -36,6 +36,7 @@
 @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 @@
         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);