diff --git a/src/com/android/settings/fuelgauge/batteryusage/BatteryChartPreferenceController.java b/src/com/android/settings/fuelgauge/batteryusage/BatteryChartPreferenceController.java index 90610f8e1c8..124d4b4296c 100644 --- a/src/com/android/settings/fuelgauge/batteryusage/BatteryChartPreferenceController.java +++ b/src/com/android/settings/fuelgauge/batteryusage/BatteryChartPreferenceController.java @@ -629,7 +629,6 @@ public class BatteryChartPreferenceController extends AbstractPreferenceControll PowerGaugePreference preference, BatteryDiffEntry entry) { final long foregroundUsageTimeInMs = entry.mForegroundUsageTimeInMs; final long backgroundUsageTimeInMs = entry.mBackgroundUsageTimeInMs; - // TODO: update this value after the new API for foreground service is completed. final long totalUsageTimeInMs = foregroundUsageTimeInMs + backgroundUsageTimeInMs; String usageTimeSummary = null; // Not shows summary for some system components without usage time. diff --git a/src/com/android/settings/fuelgauge/batteryusage/BatteryDiffEntry.java b/src/com/android/settings/fuelgauge/batteryusage/BatteryDiffEntry.java index 32711bf21c2..496200e0320 100644 --- a/src/com/android/settings/fuelgauge/batteryusage/BatteryDiffEntry.java +++ b/src/com/android/settings/fuelgauge/batteryusage/BatteryDiffEntry.java @@ -52,7 +52,6 @@ public class BatteryDiffEntry { (a, b) -> Double.compare(b.getPercentOfTotal(), a.getPercentOfTotal()); public long mForegroundUsageTimeInMs; - public long mForegroundServiceUsageTimeInMs; public long mBackgroundUsageTimeInMs; public double mConsumePower; public double mForegroundUsageConsumePower; @@ -83,7 +82,6 @@ public class BatteryDiffEntry { public BatteryDiffEntry( Context context, long foregroundUsageTimeInMs, - long foregroundServiceUsageTimeInMs, long backgroundUsageTimeInMs, double consumePower, double foregroundUsageConsumePower, @@ -98,7 +96,6 @@ public class BatteryDiffEntry { mBackgroundUsageConsumePower = backgroundUsageConsumePower; mCachedUsageConsumePower = cachedUsageConsumePower; mForegroundUsageTimeInMs = foregroundUsageTimeInMs; - mForegroundServiceUsageTimeInMs = foregroundServiceUsageTimeInMs; mBackgroundUsageTimeInMs = backgroundUsageTimeInMs; mBatteryHistEntry = batteryHistEntry; mUserManager = context.getSystemService(UserManager.class); @@ -121,7 +118,6 @@ public class BatteryDiffEntry { return new BatteryDiffEntry( this.mContext, this.mForegroundUsageTimeInMs, - this.mForegroundServiceUsageTimeInMs, this.mBackgroundUsageTimeInMs, this.mConsumePower, this.mForegroundUsageConsumePower, @@ -385,14 +381,9 @@ public class BatteryDiffEntry { mForegroundUsageConsumePower, mForegroundServiceUsageConsumePower)) .append(String.format("\n\tconsume power= background:%f cached:%f", mBackgroundUsageConsumePower, mCachedUsageConsumePower)) - .append(String.format("\n\ttime= foreground:%s foregroundService:%s background:%s", + .append(String.format("\n\ttime= foreground:%s background:%s", StringUtil.formatElapsedTime(mContext, (double) mForegroundUsageTimeInMs, /*withSeconds=*/ true, /*collapseTimeUnit=*/ false), - StringUtil.formatElapsedTime( - mContext, - (double) mForegroundServiceUsageTimeInMs, - /*withSeconds=*/ true, - /*collapseTimeUnit=*/ false), StringUtil.formatElapsedTime(mContext, (double) mBackgroundUsageTimeInMs, /*withSeconds=*/ true, /*collapseTimeUnit=*/ false))) .append(String.format("\n\tpackage:%s|%s uid:%d userId:%d", diff --git a/src/com/android/settings/fuelgauge/batteryusage/BatteryEntry.java b/src/com/android/settings/fuelgauge/batteryusage/BatteryEntry.java index 36a92486a0c..2b56cc150fe 100644 --- a/src/com/android/settings/fuelgauge/batteryusage/BatteryEntry.java +++ b/src/com/android/settings/fuelgauge/batteryusage/BatteryEntry.java @@ -112,7 +112,6 @@ public class BatteryEntry { private final int mPowerComponentId; private long mUsageDurationMs; private long mTimeInForegroundMs; - private long mTimeInForegroundServiceMs; private long mTimeInBackgroundMs; public String mName; @@ -176,9 +175,6 @@ public class BatteryEntry { getQuickNameIconForUid(uid, packages, loadDataInBackground); mTimeInForegroundMs = uidBatteryConsumer.getTimeInStateMs(UidBatteryConsumer.STATE_FOREGROUND); - //TODO: update this to the correct API after the new API is completed. - mTimeInForegroundServiceMs = - uidBatteryConsumer.getTimeInStateMs(UidBatteryConsumer.STATE_FOREGROUND); mTimeInBackgroundMs = uidBatteryConsumer.getTimeInStateMs(UidBatteryConsumer.STATE_BACKGROUND); mConsumedPowerInForeground = safeGetConsumedPower( @@ -436,15 +432,6 @@ public class BatteryEntry { } } - /** Returns foreground service time/ms that is attributed to this entry. */ - public long getTimeInForegroundServiceMs() { - if (mBatteryConsumer instanceof UidBatteryConsumer) { - return mTimeInForegroundServiceMs; - } else { - return 0; - } - } - /** Returns background activity time/ms that is attributed to this entry. */ public long getTimeInBackgroundMs() { if (mBatteryConsumer instanceof UidBatteryConsumer) { @@ -518,9 +505,6 @@ public class BatteryEntry { UidBatteryConsumer uidBatteryConsumer = (UidBatteryConsumer) batteryConsumer; mTimeInForegroundMs += uidBatteryConsumer.getTimeInStateMs( UidBatteryConsumer.STATE_FOREGROUND); - //TODO: update this to the correct API after the new API is completed. - mTimeInForegroundServiceMs += uidBatteryConsumer.getTimeInStateMs( - UidBatteryConsumer.STATE_FOREGROUND); mTimeInBackgroundMs += uidBatteryConsumer.getTimeInStateMs( UidBatteryConsumer.STATE_BACKGROUND); mConsumedPowerInForeground += safeGetConsumedPower( diff --git a/src/com/android/settings/fuelgauge/batteryusage/BatteryHistEntry.java b/src/com/android/settings/fuelgauge/batteryusage/BatteryHistEntry.java index 5cd63e80ffa..2cfb526d0fb 100644 --- a/src/com/android/settings/fuelgauge/batteryusage/BatteryHistEntry.java +++ b/src/com/android/settings/fuelgauge/batteryusage/BatteryHistEntry.java @@ -56,7 +56,6 @@ public class BatteryHistEntry { public final double mCachedUsageConsumePower; public final double mPercentOfTotal; public final long mForegroundUsageTimeInMs; - public final long mForegroundServiceUsageTimeInMs; public final long mBackgroundUsageTimeInMs; @BatteryConsumer.PowerComponent public final int mDrainType; @@ -91,7 +90,6 @@ public class BatteryHistEntry { mCachedUsageConsumePower = batteryInformation.getCachedUsageConsumePower(); mPercentOfTotal = batteryInformation.getPercentOfTotal(); mForegroundUsageTimeInMs = batteryInformation.getForegroundUsageTimeInMs(); - mForegroundServiceUsageTimeInMs = batteryInformation.getForegroundServiceUsageTimeInMs(); mBackgroundUsageTimeInMs = batteryInformation.getBackgroundUsageTimeInMs(); mDrainType = batteryInformation.getDrainType(); final DeviceBatteryState deviceBatteryState = batteryInformation.getDeviceBatteryState(); @@ -121,7 +119,6 @@ public class BatteryHistEntry { mCachedUsageConsumePower = batteryInformation.getCachedUsageConsumePower(); mPercentOfTotal = batteryInformation.getPercentOfTotal(); mForegroundUsageTimeInMs = batteryInformation.getForegroundUsageTimeInMs(); - mForegroundServiceUsageTimeInMs = batteryInformation.getForegroundServiceUsageTimeInMs(); mBackgroundUsageTimeInMs = batteryInformation.getBackgroundUsageTimeInMs(); mDrainType = batteryInformation.getDrainType(); final DeviceBatteryState deviceBatteryState = batteryInformation.getDeviceBatteryState(); @@ -141,7 +138,6 @@ public class BatteryHistEntry { double backgroundUsageConsumePower, double cachedUsageConsumePower, long foregroundUsageTimeInMs, - long foregroundServiceUsageTimeInMs, long backgroundUsageTimeInMs, int batteryLevel) { mUid = fromEntry.mUid; @@ -160,7 +156,6 @@ public class BatteryHistEntry { mCachedUsageConsumePower = cachedUsageConsumePower; mPercentOfTotal = fromEntry.mPercentOfTotal; mForegroundUsageTimeInMs = foregroundUsageTimeInMs; - mForegroundServiceUsageTimeInMs = foregroundServiceUsageTimeInMs; mBackgroundUsageTimeInMs = backgroundUsageTimeInMs; mDrainType = fromEntry.mDrainType; mConsumerType = fromEntry.mConsumerType; @@ -223,9 +218,8 @@ public class BatteryHistEntry { mForegroundUsageConsumePower, mForegroundServiceUsageConsumePower)) .append(String.format("\n\tbackground=%f|cached=%f", mBackgroundUsageConsumePower, mCachedUsageConsumePower)) - .append(String.format("\n\telapsedTime=%d|%d|%d", + .append(String.format("\n\telapsedTime=%d|%d", Duration.ofMillis(mForegroundUsageTimeInMs).getSeconds(), - Duration.ofMillis(mForegroundServiceUsageTimeInMs).getSeconds(), Duration.ofMillis(mBackgroundUsageTimeInMs).getSeconds())) .append(String.format("\n\tdrainType=%d|consumerType=%d", mDrainType, mConsumerType)) @@ -320,12 +314,6 @@ public class BatteryHistEntry { (double) (lowerHistEntry == null ? 0 : lowerHistEntry.mForegroundUsageTimeInMs), (double) upperHistEntry.mForegroundUsageTimeInMs, ratio); - final double foregroundServiceUsageTimeInMs = interpolate( - (double) (lowerHistEntry == null - ? 0 - : lowerHistEntry.mForegroundServiceUsageTimeInMs), - (double) upperHistEntry.mForegroundServiceUsageTimeInMs, - ratio); final double backgroundUsageTimeInMs = interpolate( (double) (lowerHistEntry == null ? 0 : lowerHistEntry.mBackgroundUsageTimeInMs), (double) upperHistEntry.mBackgroundUsageTimeInMs, @@ -338,7 +326,6 @@ public class BatteryHistEntry { || upperHistEntry.mBackgroundUsageConsumePower < backgroundUsageConsumePower || upperHistEntry.mCachedUsageConsumePower < cachedUsageConsumePower || upperHistEntry.mForegroundUsageTimeInMs < foregroundUsageTimeInMs - || upperHistEntry.mForegroundServiceUsageTimeInMs < foregroundServiceUsageTimeInMs || upperHistEntry.mBackgroundUsageTimeInMs < backgroundUsageTimeInMs) { if (DEBUG) { Log.w(TAG, String.format( @@ -365,7 +352,6 @@ public class BatteryHistEntry { backgroundUsageConsumePower, cachedUsageConsumePower, Math.round(foregroundUsageTimeInMs), - Math.round(foregroundServiceUsageTimeInMs), Math.round(backgroundUsageTimeInMs), (int) Math.round(batteryLevel)); } diff --git a/src/com/android/settings/fuelgauge/batteryusage/ConvertUtils.java b/src/com/android/settings/fuelgauge/batteryusage/ConvertUtils.java index 0c7b4abb1c2..c5c0522fc19 100644 --- a/src/com/android/settings/fuelgauge/batteryusage/ConvertUtils.java +++ b/src/com/android/settings/fuelgauge/batteryusage/ConvertUtils.java @@ -219,7 +219,6 @@ public final class ConvertUtils { .setPercentOfTotal(entry.mPercent) .setDrainType(entry.getPowerComponentId()) .setForegroundUsageTimeInMs(entry.getTimeInForegroundMs()) - .setForegroundServiceUsageTimeInMs(entry.getTimeInForegroundServiceMs()) .setBackgroundUsageTimeInMs(entry.getTimeInBackgroundMs()); } diff --git a/src/com/android/settings/fuelgauge/batteryusage/DataProcessor.java b/src/com/android/settings/fuelgauge/batteryusage/DataProcessor.java index 0a4ac7c477f..282781893cc 100644 --- a/src/com/android/settings/fuelgauge/batteryusage/DataProcessor.java +++ b/src/com/android/settings/fuelgauge/batteryusage/DataProcessor.java @@ -479,7 +479,6 @@ public final class DataProcessor { final BatteryDiffEntry currentBatteryDiffEntry = new BatteryDiffEntry( context, entry.mForegroundUsageTimeInMs, - entry.mForegroundServiceUsageTimeInMs, entry.mBackgroundUsageTimeInMs, entry.mConsumePower, entry.mForegroundUsageConsumePower, @@ -573,12 +572,10 @@ public final class DataProcessor { return batteryEntryList.stream() .filter(entry -> { final long foregroundMs = entry.getTimeInForegroundMs(); - final long foregroundServiceMs = entry.getTimeInForegroundServiceMs(); final long backgroundMs = entry.getTimeInBackgroundMs(); return entry.getConsumedPower() > 0 || (entry.getConsumedPower() == 0 - && (foregroundMs != 0 || foregroundServiceMs != 0 - || backgroundMs != 0)); + && (foregroundMs != 0 || backgroundMs != 0)); }) .map(entry -> ConvertUtils.convertToBatteryHistEntry( entry, @@ -699,14 +696,9 @@ public final class DataProcessor { if (lowerEntry != null) { final boolean invalidForegroundUsageTime = lowerEntry.mForegroundUsageTimeInMs > upperEntry.mForegroundUsageTimeInMs; - final boolean invalidForegroundServiceUsageTime = - lowerEntry.mForegroundServiceUsageTimeInMs - > upperEntry.mForegroundServiceUsageTimeInMs; final boolean invalidBackgroundUsageTime = lowerEntry.mBackgroundUsageTimeInMs > upperEntry.mBackgroundUsageTimeInMs; - if (invalidForegroundUsageTime - || invalidForegroundServiceUsageTime - || invalidBackgroundUsageTime) { + if (invalidForegroundUsageTime || invalidBackgroundUsageTime) { newHistEntryMap.put(entryKey, upperEntry); log(context, "abnormal reset condition is found", currentSlot, upperEntry); continue; @@ -937,11 +929,6 @@ public final class DataProcessor { currentEntry.mForegroundUsageTimeInMs, nextEntry.mForegroundUsageTimeInMs, nextTwoEntry.mForegroundUsageTimeInMs); - long foregroundServiceUsageTimeInMs = - getDiffValue( - currentEntry.mForegroundServiceUsageTimeInMs, - nextEntry.mForegroundServiceUsageTimeInMs, - nextTwoEntry.mForegroundServiceUsageTimeInMs); long backgroundUsageTimeInMs = getDiffValue( currentEntry.mBackgroundUsageTimeInMs, @@ -974,7 +961,6 @@ public final class DataProcessor { nextTwoEntry.mCachedUsageConsumePower); // Excludes entry since we don't have enough data to calculate. if (foregroundUsageTimeInMs == 0 - && foregroundServiceUsageTimeInMs == 0 && backgroundUsageTimeInMs == 0 && consumePower == 0) { continue; @@ -986,7 +972,6 @@ public final class DataProcessor { } // Forces refine the cumulative value since it may introduce deviation error since we // will apply the interpolation arithmetic. - // TODO: update this value after the new API for foreground service is completed. final float totalUsageTimeInMs = foregroundUsageTimeInMs + backgroundUsageTimeInMs; if (totalUsageTimeInMs > TOTAL_HOURLY_TIME_THRESHOLD) { @@ -999,8 +984,6 @@ public final class DataProcessor { } foregroundUsageTimeInMs = Math.round(foregroundUsageTimeInMs * ratio); - foregroundServiceUsageTimeInMs = - Math.round(foregroundServiceUsageTimeInMs * ratio); backgroundUsageTimeInMs = Math.round(backgroundUsageTimeInMs * ratio); consumePower = consumePower * ratio; @@ -1019,7 +1002,6 @@ public final class DataProcessor { final BatteryDiffEntry currentBatteryDiffEntry = new BatteryDiffEntry( context, foregroundUsageTimeInMs, - foregroundServiceUsageTimeInMs, backgroundUsageTimeInMs, consumePower, foregroundUsageConsumePower, @@ -1105,8 +1087,6 @@ public final class DataProcessor { // Sums up some field data into the existing one. oldBatteryDiffEntry.mForegroundUsageTimeInMs += entry.mForegroundUsageTimeInMs; - oldBatteryDiffEntry.mForegroundServiceUsageTimeInMs += - entry.mForegroundServiceUsageTimeInMs; oldBatteryDiffEntry.mBackgroundUsageTimeInMs += entry.mBackgroundUsageTimeInMs; oldBatteryDiffEntry.mConsumePower += entry.mConsumePower; @@ -1404,7 +1384,6 @@ public final class DataProcessor { final BatteryDiffEntry batteryDiffEntry = new BatteryDiffEntry( context, /*foregroundUsageTimeInMs=*/ 0, - /*foregroundServiceUsageTimeInMs=*/ 0, /*backgroundUsageTimeInMs=*/ 0, consumePower, /*foregroundUsageConsumePower=*/ 0, diff --git a/src/com/android/settings/fuelgauge/batteryusage/DatabaseUtils.java b/src/com/android/settings/fuelgauge/batteryusage/DatabaseUtils.java index fdcbb4a52a2..8ff802db82e 100644 --- a/src/com/android/settings/fuelgauge/batteryusage/DatabaseUtils.java +++ b/src/com/android/settings/fuelgauge/batteryusage/DatabaseUtils.java @@ -165,20 +165,16 @@ public final class DatabaseUtils { batteryEntryList.stream() .filter(entry -> { final long foregroundMs = entry.getTimeInForegroundMs(); - final long foregroundServiceMs = entry.getTimeInForegroundServiceMs(); final long backgroundMs = entry.getTimeInBackgroundMs(); if (entry.getConsumedPower() == 0 && (foregroundMs != 0 - || foregroundServiceMs != 0 || backgroundMs != 0)) { Log.w(TAG, String.format( - "no consumed power but has running time for %s time=%d|%d|%d", - entry.getLabel(), foregroundMs, foregroundServiceMs, - backgroundMs)); + "no consumed power but has running time for %s time=%d|%d", + entry.getLabel(), foregroundMs, backgroundMs)); } return entry.getConsumedPower() != 0 || foregroundMs != 0 - || foregroundServiceMs != 0 || backgroundMs != 0; }) .forEach(entry -> valuesList.add( diff --git a/src/com/android/settings/fuelgauge/protos/fuelgauge_usage_state.proto b/src/com/android/settings/fuelgauge/protos/fuelgauge_usage_state.proto index 813344b6b9f..b9b05a3be73 100644 --- a/src/com/android/settings/fuelgauge/protos/fuelgauge_usage_state.proto +++ b/src/com/android/settings/fuelgauge/protos/fuelgauge_usage_state.proto @@ -31,10 +31,9 @@ message BatteryInformation { optional double percent_of_total = 12; optional int32 drain_type = 13; optional int64 foreground_usage_time_in_ms = 14; - optional int64 foreground_service_usage_time_in_ms = 15; - optional int64 background_usage_time_in_ms = 16; - optional double foreground_usage_consume_power = 17; - optional double foreground_service_usage_consume_power = 18; - optional double background_usage_consume_power = 19; - optional double cached_usage_consume_power = 20; + optional int64 background_usage_time_in_ms = 15; + optional double foreground_usage_consume_power = 16; + optional double foreground_service_usage_consume_power = 17; + optional double background_usage_consume_power = 18; + optional double cached_usage_consume_power = 19; } \ No newline at end of file diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryChartPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryChartPreferenceControllerTest.java index 5c84997349f..b7984421cf2 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryChartPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryChartPreferenceControllerTest.java @@ -127,7 +127,6 @@ public final class BatteryChartPreferenceControllerTest { mBatteryDiffEntry = new BatteryDiffEntry( mContext, /*foregroundUsageTimeInMs=*/ 1, - /*foregroundServiceUsageTimeInMs=*/ 3, /*backgroundUsageTimeInMs=*/ 2, /*consumePower=*/ 3, /*foregroundUsageConsumePower=*/ 0, @@ -463,7 +462,6 @@ public final class BatteryChartPreferenceControllerTest { mBatteryChartPreferenceController.setPreferenceSummary( pref, createBatteryDiffEntry( /*foregroundUsageTimeInMs=*/ 0, - /*foregroundServiceUsageTimeInMs=*/ 0, /*backgroundUsageTimeInMs=*/ 0)); assertThat(pref.getSummary()).isNull(); } @@ -476,7 +474,6 @@ public final class BatteryChartPreferenceControllerTest { mBatteryChartPreferenceController.setPreferenceSummary( pref, createBatteryDiffEntry( /*foregroundUsageTimeInMs=*/ 0, - /*foregroundServiceUsageTimeInMs=*/ 0, /*backgroundUsageTimeInMs=*/ DateUtils.MINUTE_IN_MILLIS)); assertThat(pref.getSummary()).isEqualTo("Background: 1 min"); } @@ -489,7 +486,6 @@ public final class BatteryChartPreferenceControllerTest { mBatteryChartPreferenceController.setPreferenceSummary( pref, createBatteryDiffEntry( /*foregroundUsageTimeInMs=*/ 100, - /*foregroundServiceUsageTimeInMs=*/ 200, /*backgroundUsageTimeInMs=*/ 200)); assertThat(pref.getSummary()).isEqualTo("Total: less than a min"); } @@ -502,7 +498,6 @@ public final class BatteryChartPreferenceControllerTest { mBatteryChartPreferenceController.setPreferenceSummary( pref, createBatteryDiffEntry( /*foregroundUsageTimeInMs=*/ DateUtils.MINUTE_IN_MILLIS, - /*foregroundServiceUsageTimeInMs=*/ 100, /*backgroundUsageTimeInMs=*/ 200)); assertThat(pref.getSummary()) .isEqualTo("Total: 1 min\nBackground: less than a min"); @@ -516,7 +511,6 @@ public final class BatteryChartPreferenceControllerTest { mBatteryChartPreferenceController.setPreferenceSummary( pref, createBatteryDiffEntry( /*foregroundUsageTimeInMs=*/ DateUtils.MINUTE_IN_MILLIS, - /*foregroundServiceUsageTimeInMs=*/ DateUtils.MINUTE_IN_MILLIS, /*backgroundUsageTimeInMs=*/ DateUtils.MINUTE_IN_MILLIS)); assertThat(pref.getSummary()).isEqualTo("Total: 2 min\nBackground: 1 min"); } @@ -727,13 +721,12 @@ public final class BatteryChartPreferenceControllerTest { } private BatteryDiffEntry createBatteryDiffEntry( - long foregroundUsageTimeInMs, long foregroundServiceUsageTimeInMs, - long backgroundUsageTimeInMs) { + long foregroundUsageTimeInMs, long backgroundUsageTimeInMs) { return new BatteryDiffEntry( - mContext, foregroundUsageTimeInMs, foregroundServiceUsageTimeInMs, - backgroundUsageTimeInMs, /*consumePower=*/ 0, /*foregroundUsageConsumePower=*/ 0, - /*foregroundServiceUsageConsumePower=*/ 0, /*backgroundUsageConsumePower=*/ 0, - /*cachedUsageConsumePower=*/ 0, mBatteryHistEntry); + mContext, foregroundUsageTimeInMs, backgroundUsageTimeInMs, /*consumePower=*/ 0, + /*foregroundUsageConsumePower=*/ 0, /*foregroundServiceUsageConsumePower=*/ 0, + /*backgroundUsageConsumePower=*/ 0, /*cachedUsageConsumePower=*/ 0, + mBatteryHistEntry); } private BatteryChartPreferenceController createController() { diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryDiffEntryTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryDiffEntryTest.java index 00904366c74..f8bcbc82663 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryDiffEntryTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryDiffEntryTest.java @@ -96,7 +96,6 @@ public final class BatteryDiffEntryTest { new BatteryDiffEntry( mContext, /*foregroundUsageTimeInMs=*/ 10001L, - /*foregroundServiceUsageTimeInMs=*/ 10002L, /*backgroundUsageTimeInMs=*/ 20002L, /*consumePower=*/ 22.0, /*foregroundUsageConsumePower=*/ 10.0, @@ -115,7 +114,6 @@ public final class BatteryDiffEntryTest { new BatteryDiffEntry( mContext, /*foregroundUsageTimeInMs=*/ 10001L, - /*foregroundServiceUsageTimeInMs=*/ 10002L, /*backgroundUsageTimeInMs=*/ 20002L, /*consumePower=*/ 22.0, /*foregroundUsageConsumePower=*/ 10.0, @@ -493,7 +491,6 @@ public final class BatteryDiffEntryTest { return new BatteryDiffEntry( mContext, /*foregroundUsageTimeInMs=*/ 0, - /*foregroundServiceUsageTimeInMs=*/ 0, /*backgroundUsageTimeInMs=*/ 0, /*consumePower=*/ 0, /*foregroundUsageConsumePower=*/ 0, @@ -508,7 +505,6 @@ public final class BatteryDiffEntryTest { final BatteryDiffEntry entry = new BatteryDiffEntry( mContext, /*foregroundUsageTimeInMs=*/ 0, - /*foregroundServiceUsageTimeInMs=*/ 0, /*backgroundUsageTimeInMs=*/ 0, consumePower, /*foregroundUsageConsumePower=*/ 0, diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryHistEntryTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryHistEntryTest.java index 848265a5d09..5c143b1a6de 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryHistEntryTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryHistEntryTest.java @@ -63,7 +63,6 @@ public final class BatteryHistEntryTest { when(mMockBatteryEntry.getConsumedPowerInCached()).thenReturn(1.5); mMockBatteryEntry.mPercent = 0.3; when(mMockBatteryEntry.getTimeInForegroundMs()).thenReturn(1234L); - when(mMockBatteryEntry.getTimeInForegroundServiceMs()).thenReturn(3456L); when(mMockBatteryEntry.getTimeInBackgroundMs()).thenReturn(5689L); when(mMockBatteryEntry.getPowerComponentId()).thenReturn(expectedType); when(mMockBatteryEntry.getConsumerType()) @@ -104,7 +103,6 @@ public final class BatteryHistEntryTest { /*backgroundUsageConsumePower=*/ 1.4, /*cachedUsageConsumePower=*/ 1.5, /*foregroundUsageTimeInMs=*/ 1234L, - /*foregroundServiceUsageTimeInMs=*/ 3456L, /*backgroundUsageTimeInMs=*/ 5689L, /*batteryLevel=*/ 12), /*drainType=*/ 3, @@ -193,7 +191,6 @@ public final class BatteryHistEntryTest { /*backgroundUsageConsumePower=*/ 3, /*cachedUsageConsumePower=*/ 4, /*foregroundUsageTimeInMs=*/ 100, - /*foregroundServiceUsageTimeInMs=*/ 150, /*backgroundUsageTimeInMs=*/ 200, /*batteryLevel=*/ 90); final BatteryHistEntry upperHistEntry = createBatteryHistEntry( @@ -206,7 +203,6 @@ public final class BatteryHistEntryTest { /*backgroundUsageConsumePower=*/ 6, /*cachedUsageConsumePower=*/ 5, /*foregroundUsageTimeInMs=*/ 200, - /*foregroundServiceUsageTimeInMs=*/ 250, /*backgroundUsageTimeInMs=*/ 300, /*batteryLevel=*/ 80); @@ -229,7 +225,6 @@ public final class BatteryHistEntryTest { /*backgroundUsageConsumePower=*/ 3 + 0.5 * (6 - 3), /*cachedUsageConsumePower=*/ 4 + 0.5 * (5 - 4), /*foregroundUsageTimeInMs=*/ Math.round(100 + 0.5 * (200 - 100)), - /*foregroundServiceUsageTimeInMs=*/ Math.round(150 + 0.5 * (250 - 150)), /*backgroundUsageTimeInMs=*/ Math.round(200 + 0.5 * (300 - 200)), /*batteryLevel=*/ (int) Math.round(90 + 0.5 * (80 - 90))); } @@ -249,7 +244,6 @@ public final class BatteryHistEntryTest { /*backgroundUsageConsumePower=*/ 6, /*cachedUsageConsumePower=*/ 5, /*foregroundUsageTimeInMs=*/ 200, - /*foregroundServiceUsageTimeInMs=*/ 250, /*backgroundUsageTimeInMs=*/ 300, /*batteryLevel=*/ 80); @@ -272,7 +266,6 @@ public final class BatteryHistEntryTest { /*backgroundUsageConsumePower=*/ 0.5 * 6, /*cachedUsageConsumePower=*/ 0.5 * 5, /*foregroundUsageTimeInMs=*/ Math.round(0.5 * 200), - /*foregroundServiceUsageTimeInMs=*/ Math.round(0.5 * 250), /*backgroundUsageTimeInMs=*/ Math.round(0.5 * 300), /*batteryLevel=*/ upperHistEntry.mBatteryLevel); } @@ -301,7 +294,6 @@ public final class BatteryHistEntryTest { /*backgroundUsageConsumePower=*/ 1.4, /*cachedUsageConsumePower=*/ 1.5, /*foregroundUsageTimeInMs=*/ 1234L, - /*foregroundServiceUsageTimeInMs=*/ 3456L, /*backgroundUsageTimeInMs=*/ 5689L, /*batteryLevel=*/ 12); } @@ -319,7 +311,6 @@ public final class BatteryHistEntryTest { double backgroundUsageConsumePower, double cachedUsageConsumePower, long foregroundUsageTimeInMs, - long foregroundServiceUsageTimeInMs, long backgroundUsageTimeInMs, int batteryLevel) { assertThat(entry.isValidEntry()).isTrue(); @@ -341,8 +332,6 @@ public final class BatteryHistEntryTest { assertThat(entry.mCachedUsageConsumePower).isEqualTo(cachedUsageConsumePower); assertThat(entry.mPercentOfTotal).isEqualTo(percentOfTotal); assertThat(entry.mForegroundUsageTimeInMs).isEqualTo(foregroundUsageTimeInMs); - assertThat(entry.mForegroundServiceUsageTimeInMs) - .isEqualTo(foregroundServiceUsageTimeInMs); assertThat(entry.mBackgroundUsageTimeInMs).isEqualTo(backgroundUsageTimeInMs); assertThat(entry.mDrainType).isEqualTo(drainType); assertThat(entry.mConsumerType) @@ -364,7 +353,6 @@ public final class BatteryHistEntryTest { double backgroundUsageConsumePower, double cachedUsageConsumePower, long foregroundUsageTimeInMs, - long foregroundServiceUsageTimeInMs, long backgroundUsageTimeInMs, int batteryLevel) { final MatrixCursor cursor = new MatrixCursor( @@ -399,7 +387,6 @@ public final class BatteryHistEntryTest { .setPercentOfTotal(0.3) .setDrainType(3) .setForegroundUsageTimeInMs(foregroundUsageTimeInMs) - .setForegroundServiceUsageTimeInMs(foregroundServiceUsageTimeInMs) .setBackgroundUsageTimeInMs(backgroundUsageTimeInMs) .build(); cursor.addRow( diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageContentProviderTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageContentProviderTest.java index d6e7737a21b..d578b8952df 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageContentProviderTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageContentProviderTest.java @@ -202,7 +202,6 @@ public final class BatteryUsageContentProviderTest { .setCachedUsageConsumePower(3) .setPercentOfTotal(0.9) .setForegroundUsageTimeInMs(1000) - .setForegroundServiceUsageTimeInMs(1500) .setBackgroundUsageTimeInMs(2000) .setDrainType(1) .build(); diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/ConvertUtilsTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/ConvertUtilsTest.java index 9a4355724e9..978930ae0aa 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/ConvertUtilsTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/ConvertUtilsTest.java @@ -70,7 +70,6 @@ public final class ConvertUtilsTest { when(mMockBatteryEntry.getConsumedPowerInCached()).thenReturn(1.5); mMockBatteryEntry.mPercent = 0.3; when(mMockBatteryEntry.getTimeInForegroundMs()).thenReturn(1234L); - when(mMockBatteryEntry.getTimeInForegroundServiceMs()).thenReturn(3456L); when(mMockBatteryEntry.getTimeInBackgroundMs()).thenReturn(5689L); when(mMockBatteryEntry.getPowerComponentId()).thenReturn(expectedType); when(mMockBatteryEntry.getConsumerType()) @@ -112,7 +111,6 @@ public final class ConvertUtilsTest { assertThat(batteryInformation.getCachedUsageConsumePower()).isEqualTo(1.5); assertThat(batteryInformation.getPercentOfTotal()).isEqualTo(0.3); assertThat(batteryInformation.getForegroundUsageTimeInMs()).isEqualTo(1234L); - assertThat(batteryInformation.getForegroundServiceUsageTimeInMs()).isEqualTo(3456L); assertThat(batteryInformation.getBackgroundUsageTimeInMs()).isEqualTo(5689L); assertThat(batteryInformation.getDrainType()).isEqualTo(expectedType); assertThat(deviceBatteryState.getBatteryLevel()).isEqualTo(12); @@ -169,7 +167,6 @@ public final class ConvertUtilsTest { when(mMockBatteryEntry.getConsumedPowerInCached()).thenReturn(1.5); mMockBatteryEntry.mPercent = 0.3; when(mMockBatteryEntry.getTimeInForegroundMs()).thenReturn(1234L); - when(mMockBatteryEntry.getTimeInForegroundServiceMs()).thenReturn(3456L); when(mMockBatteryEntry.getTimeInBackgroundMs()).thenReturn(5689L); when(mMockBatteryEntry.getPowerComponentId()).thenReturn(expectedType); when(mMockBatteryEntry.getConsumerType()) @@ -202,8 +199,6 @@ public final class ConvertUtilsTest { assertThat(batteryHistEntry.mPercentOfTotal).isEqualTo(0.3); assertThat(batteryHistEntry.mForegroundUsageTimeInMs) .isEqualTo(1234L); - assertThat(batteryHistEntry.mForegroundServiceUsageTimeInMs) - .isEqualTo(3456L); assertThat(batteryHistEntry.mBackgroundUsageTimeInMs) .isEqualTo(5689L); assertThat(batteryHistEntry.mDrainType).isEqualTo(expectedType); diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/DataProcessorTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/DataProcessorTest.java index cdfed06f446..0926d146db9 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/DataProcessorTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/DataProcessorTest.java @@ -536,8 +536,7 @@ public class DataProcessorTest { /*foregroundUsageConsumePower=*/ 0, /*foregroundServiceUsageConsumePower=*/ 0, /*backgroundUsageConsumePower=*/ 0, /*cachedUsageConsumePower=*/ 0, /*uid=*/ 0L, currentUserId, ConvertUtils.CONSUMER_TYPE_UID_BATTERY, - /*foregroundUsageTimeInMs=*/ 0L, /*foregroundServiceUsageTimeInMs=*/ 0L, - /*backgroundUsageTimeInMs=*/ 0L); + /*foregroundUsageTimeInMs=*/ 0L, /*backgroundUsageTimeInMs=*/ 0L); // Adds the index = 0 data. Map entryMap = new HashMap<>(); BatteryHistEntry entry = createBatteryHistEntry( @@ -546,7 +545,7 @@ public class DataProcessorTest { /*backgroundUsageConsumePower=*/ 3, /*cachedUsageConsumePower=*/ 0, /*uid=*/ 1L, currentUserId, ConvertUtils.CONSUMER_TYPE_UID_BATTERY, /*foregroundUsageTimeInMs=*/ 10L, - /*foregroundServiceUsageTimeInMs=*/ 10L, /*backgroundUsageTimeInMs=*/ 20L); + /*backgroundUsageTimeInMs=*/ 20L); entryMap.put(entry.getKey(), entry); entryMap.put(fakeEntry.getKey(), fakeEntry); batteryHistoryMap.put(batteryHistoryKeys[0], entryMap); @@ -562,7 +561,7 @@ public class DataProcessorTest { /*backgroundUsageConsumePower=*/ 5, /*cachedUsageConsumePower=*/ 5, /*uid=*/ 2L, currentUserId, ConvertUtils.CONSUMER_TYPE_UID_BATTERY, /*foregroundUsageTimeInMs=*/ 15L, - /*foregroundServiceUsageTimeInMs=*/ 15L, /*backgroundUsageTimeInMs=*/ 25L); + /*backgroundUsageTimeInMs=*/ 25L); entryMap.put(entry.getKey(), entry); entryMap.put(fakeEntry.getKey(), fakeEntry); batteryHistoryMap.put(batteryHistoryKeys[2], entryMap); @@ -574,7 +573,7 @@ public class DataProcessorTest { /*backgroundUsageConsumePower=*/ 8, /*cachedUsageConsumePower=*/ 8, /*uid=*/ 2L, currentUserId, ConvertUtils.CONSUMER_TYPE_UID_BATTERY, /*foregroundUsageTimeInMs=*/ 25L, - /*foregroundServiceUsageTimeInMs=*/ 25L, /*backgroundUsageTimeInMs=*/ 35L); + /*backgroundUsageTimeInMs=*/ 35L); entryMap.put(entry.getKey(), entry); entry = createBatteryHistEntry( "package2", "label2", /*consumePower=*/ 10.0, @@ -582,7 +581,7 @@ public class DataProcessorTest { /*backgroundUsageConsumePower=*/ 2, /*cachedUsageConsumePower=*/ 2, /*uid=*/ 3L, currentUserId, ConvertUtils.CONSUMER_TYPE_SYSTEM_BATTERY, /*foregroundUsageTimeInMs=*/ 40L, - /*foregroundServiceUsageTimeInMs=*/ 40L, /*backgroundUsageTimeInMs=*/ 50L); + /*backgroundUsageTimeInMs=*/ 50L); entryMap.put(entry.getKey(), entry); entry = createBatteryHistEntry( "package3", "label3", /*consumePower=*/ 15.0, @@ -590,7 +589,7 @@ public class DataProcessorTest { /*backgroundUsageConsumePower=*/ 3, /*cachedUsageConsumePower=*/ 3, /*uid=*/ 4L, currentUserId, ConvertUtils.CONSUMER_TYPE_UID_BATTERY, /*foregroundUsageTimeInMs=*/ 5L, - /*foregroundServiceUsageTimeInMs=*/ 5L, /*backgroundUsageTimeInMs=*/ 5L); + /*backgroundUsageTimeInMs=*/ 5L); entryMap.put(entry.getKey(), entry); entryMap.put(fakeEntry.getKey(), fakeEntry); batteryHistoryMap.put(batteryHistoryKeys[3], entryMap); @@ -602,7 +601,7 @@ public class DataProcessorTest { /*backgroundUsageConsumePower=*/ 9, /*cachedUsageConsumePower=*/ 8, /*uid=*/ 2L, currentUserId, ConvertUtils.CONSUMER_TYPE_UID_BATTERY, /*foregroundUsageTimeInMs=*/ 30L, - /*foregroundServiceUsageTimeInMs=*/ 30L, /*backgroundUsageTimeInMs=*/ 40L); + /*backgroundUsageTimeInMs=*/ 40L); entryMap.put(entry.getKey(), entry); entry = createBatteryHistEntry( "package2", "label2", /*consumePower=*/ 20.0, @@ -610,7 +609,7 @@ public class DataProcessorTest { /*backgroundUsageConsumePower=*/ 5, /*cachedUsageConsumePower=*/ 5, /*uid=*/ 3L, currentUserId, ConvertUtils.CONSUMER_TYPE_SYSTEM_BATTERY, /*foregroundUsageTimeInMs=*/ 50L, - /*foregroundServiceUsageTimeInMs=*/ 50L, /*backgroundUsageTimeInMs=*/ 60L); + /*backgroundUsageTimeInMs=*/ 60L); entryMap.put(entry.getKey(), entry); entry = createBatteryHistEntry( "package3", "label3", /*consumePower=*/ 40.0, @@ -618,7 +617,7 @@ public class DataProcessorTest { /*backgroundUsageConsumePower=*/ 8, /*cachedUsageConsumePower=*/ 8, /*uid=*/ 4L, currentUserId, ConvertUtils.CONSUMER_TYPE_UID_BATTERY, /*foregroundUsageTimeInMs=*/ 5L, - /*foregroundServiceUsageTimeInMs=*/ 5L, /*backgroundUsageTimeInMs=*/ 5L); + /*backgroundUsageTimeInMs=*/ 5L); entryMap.put(entry.getKey(), entry); entryMap.put(fakeEntry.getKey(), fakeEntry); batteryHistoryMap.put(batteryHistoryKeys[4], entryMap); @@ -648,52 +647,45 @@ public class DataProcessorTest { ConvertUtils.CONSUMER_TYPE_UID_BATTERY, /*consumePercentage=*/ 40.0, /*foregroundUsageConsumePower=*/ 14, /*foregroundServiceUsageConsumePower=*/ 9, /*backgroundUsageConsumePower=*/ 9, /*cachedUsageConsumePower=*/ 8, - /*foregroundUsageTimeInMs=*/ 30, /*foregroundServiceUsageTimeInMs=*/ 30, - /*backgroundUsageTimeInMs=*/ 40); + /*foregroundUsageTimeInMs=*/ 30, /*backgroundUsageTimeInMs=*/ 40); assertBatteryDiffEntry( resultDiffData.getAppDiffEntryList().get(1), currentUserId, /*uid=*/ 4L, ConvertUtils.CONSUMER_TYPE_UID_BATTERY, /*consumePercentage=*/ 40.0, /*foregroundUsageConsumePower=*/ 8, /*foregroundServiceUsageConsumePower=*/ 8, /*backgroundUsageConsumePower=*/ 8, /*cachedUsageConsumePower=*/ 8, - /*foregroundUsageTimeInMs=*/ 5, /*foregroundServiceUsageTimeInMs=*/ 5, - /*backgroundUsageTimeInMs=*/ 5); + /*foregroundUsageTimeInMs=*/ 5, /*backgroundUsageTimeInMs=*/ 5); assertBatteryDiffEntry( resultDiffData.getSystemDiffEntryList().get(0), currentUserId, /*uid=*/ 3L, ConvertUtils.CONSUMER_TYPE_SYSTEM_BATTERY, /*consumePercentage=*/ 20.0, /*foregroundUsageConsumePower=*/ 5, /*foregroundServiceUsageConsumePower=*/ 5, /*backgroundUsageConsumePower=*/ 5, /*cachedUsageConsumePower=*/ 5, - /*foregroundUsageTimeInMs=*/ 50, /*foregroundServiceUsageTimeInMs=*/ 50, - /*backgroundUsageTimeInMs=*/ 60); + /*foregroundUsageTimeInMs=*/ 50, /*backgroundUsageTimeInMs=*/ 60); resultDiffData = resultMap.get(0).get(DataProcessor.SELECTED_INDEX_ALL); assertBatteryDiffEntry( resultDiffData.getAppDiffEntryList().get(0), currentUserId, /*uid=*/ 2L, ConvertUtils.CONSUMER_TYPE_UID_BATTERY, /*consumePercentage=*/ 100.0, /*foregroundUsageConsumePower=*/ 5, /*foregroundServiceUsageConsumePower=*/ 5, /*backgroundUsageConsumePower=*/ 5, /*cachedUsageConsumePower=*/ 5, - /*foregroundUsageTimeInMs=*/ 15, /*foregroundServiceUsageTimeInMs=*/ 15, - /*backgroundUsageTimeInMs=*/ 25); + /*foregroundUsageTimeInMs=*/ 15, /*backgroundUsageTimeInMs=*/ 25); resultDiffData = resultMap.get(1).get(DataProcessor.SELECTED_INDEX_ALL); assertBatteryDiffEntry( resultDiffData.getAppDiffEntryList().get(0), currentUserId, /*uid=*/ 4L, ConvertUtils.CONSUMER_TYPE_UID_BATTERY, /*consumePercentage=*/ 50.0, /*foregroundUsageConsumePower=*/ 8, /*foregroundServiceUsageConsumePower=*/ 8, /*backgroundUsageConsumePower=*/ 8, /*cachedUsageConsumePower=*/ 8, - /*foregroundUsageTimeInMs=*/ 5, /*foregroundServiceUsageTimeInMs=*/ 5, - /*backgroundUsageTimeInMs=*/ 5); + /*foregroundUsageTimeInMs=*/ 5, /*backgroundUsageTimeInMs=*/ 5); assertBatteryDiffEntry( resultDiffData.getAppDiffEntryList().get(1), currentUserId, /*uid=*/ 2L, ConvertUtils.CONSUMER_TYPE_UID_BATTERY, /*consumePercentage=*/ 25.0, /*foregroundUsageConsumePower=*/ 9, /*foregroundServiceUsageConsumePower=*/ 4, /*backgroundUsageConsumePower=*/ 4, /*cachedUsageConsumePower=*/ 3, - /*foregroundUsageTimeInMs=*/ 15, /*foregroundServiceUsageTimeInMs=*/ 15, - /*backgroundUsageTimeInMs=*/ 15); + /*foregroundUsageTimeInMs=*/ 15, /*backgroundUsageTimeInMs=*/ 15); assertBatteryDiffEntry( resultDiffData.getSystemDiffEntryList().get(0), currentUserId, /*uid=*/ 3L, ConvertUtils.CONSUMER_TYPE_SYSTEM_BATTERY, /*consumePercentage=*/ 25.0, /*foregroundUsageConsumePower=*/ 5, /*foregroundServiceUsageConsumePower=*/ 5, /*backgroundUsageConsumePower=*/ 5, /*cachedUsageConsumePower=*/ 5, - /*foregroundUsageTimeInMs=*/ 50, /*foregroundServiceUsageTimeInMs=*/ 50, - /*backgroundUsageTimeInMs=*/ 60); + /*foregroundUsageTimeInMs=*/ 50, /*backgroundUsageTimeInMs=*/ 60); verify(mMetricsFeatureProvider) .action(mContext.getApplicationContext(), SettingsEnums.ACTION_BATTERY_USAGE_SHOWN_APP_COUNT, @@ -721,7 +713,7 @@ public class DataProcessorTest { /*backgroundUsageConsumePower=*/ 0, /*cachedUsageConsumePower=*/ 0, /*uid=*/ 1L, currentUserId, ConvertUtils.CONSUMER_TYPE_UID_BATTERY, /*foregroundUsageTimeInMs=*/ 10L, - /*foregroundServiceUsageTimeInMs=*/ 10L, /*backgroundUsageTimeInMs=*/ 20L); + /*backgroundUsageTimeInMs=*/ 20L); entryMap.put(entry.getKey(), entry); entry = createBatteryHistEntry( "package1", "label1", /*consumePower=*/ 10.0, @@ -729,7 +721,7 @@ public class DataProcessorTest { /*backgroundUsageConsumePower=*/ 1, /*cachedUsageConsumePower=*/ 1, /*uid=*/ 2L, currentUserId + 1, ConvertUtils.CONSUMER_TYPE_UID_BATTERY, /*foregroundUsageTimeInMs=*/ 10L, - /*foregroundServiceUsageTimeInMs=*/ 10L, /*backgroundUsageTimeInMs=*/ 20L); + /*backgroundUsageTimeInMs=*/ 20L); entryMap.put(entry.getKey(), entry); entry = createBatteryHistEntry( "package2", "label2", /*consumePower=*/ 5.0, @@ -737,7 +729,7 @@ public class DataProcessorTest { /*backgroundUsageConsumePower=*/ 0, /*cachedUsageConsumePower=*/ 0, /*uid=*/ 3L, currentUserId + 2, ConvertUtils.CONSUMER_TYPE_UID_BATTERY, /*foregroundUsageTimeInMs=*/ 20L, - /*foregroundServiceUsageTimeInMs=*/ 20L, /*backgroundUsageTimeInMs=*/ 30L); + /*backgroundUsageTimeInMs=*/ 30L); entryMap.put(entry.getKey(), entry); batteryHistoryMap.put(batteryHistoryKeys[0], entryMap); // Adds the index = 1 data. @@ -748,7 +740,7 @@ public class DataProcessorTest { /*backgroundUsageConsumePower=*/ 2, /*cachedUsageConsumePower=*/ 2, /*uid=*/ 1L, currentUserId, ConvertUtils.CONSUMER_TYPE_UID_BATTERY, /*foregroundUsageTimeInMs=*/ 20L, - /*foregroundServiceUsageTimeInMs=*/ 20L, /*backgroundUsageTimeInMs=*/ 30L); + /*backgroundUsageTimeInMs=*/ 30L); entryMap.put(entry.getKey(), entry); entry = createBatteryHistEntry( "package1", "label1", /*consumePower=*/ 30.0, @@ -756,7 +748,7 @@ public class DataProcessorTest { /*backgroundUsageConsumePower=*/ 2, /*cachedUsageConsumePower=*/ 2, /*uid=*/ 2L, currentUserId + 1, ConvertUtils.CONSUMER_TYPE_UID_BATTERY, /*foregroundUsageTimeInMs=*/ 10L, - /*foregroundServiceUsageTimeInMs=*/ 10L, /*backgroundUsageTimeInMs=*/ 20L); + /*backgroundUsageTimeInMs=*/ 20L); entryMap.put(entry.getKey(), entry); entry = createBatteryHistEntry( "package2", "label2", /*consumePower=*/ 15.0, @@ -764,7 +756,7 @@ public class DataProcessorTest { /*backgroundUsageConsumePower=*/ 0, /*cachedUsageConsumePower=*/ 0, /*uid=*/ 3L, currentUserId + 2, ConvertUtils.CONSUMER_TYPE_UID_BATTERY, /*foregroundUsageTimeInMs=*/ 30L, - /*foregroundServiceUsageTimeInMs=*/ 30L, /*backgroundUsageTimeInMs=*/ 30L); + /*backgroundUsageTimeInMs=*/ 30L); entryMap.put(entry.getKey(), entry); batteryHistoryMap.put(batteryHistoryKeys[1], entryMap); // Adds the index = 2 data. @@ -775,7 +767,7 @@ public class DataProcessorTest { /*backgroundUsageConsumePower=*/ 5, /*cachedUsageConsumePower=*/ 5, /*uid=*/ 1L, currentUserId, ConvertUtils.CONSUMER_TYPE_UID_BATTERY, /*foregroundUsageTimeInMs=*/ 20L, - /*foregroundServiceUsageTimeInMs=*/ 25L, /*backgroundUsageTimeInMs=*/ 30L); + /*backgroundUsageTimeInMs=*/ 30L); entryMap.put(entry.getKey(), entry); entry = createBatteryHistEntry( "package1", "label1", /*consumePower=*/ 50.0, @@ -783,7 +775,7 @@ public class DataProcessorTest { /*backgroundUsageConsumePower=*/ 10, /*cachedUsageConsumePower=*/ 10, /*uid=*/ 2L, currentUserId + 1, ConvertUtils.CONSUMER_TYPE_UID_BATTERY, /*foregroundUsageTimeInMs=*/ 20L, - /*foregroundServiceUsageTimeInMs=*/ 25L, /*backgroundUsageTimeInMs=*/ 20L); + /*backgroundUsageTimeInMs=*/ 20L); entryMap.put(entry.getKey(), entry); entry = createBatteryHistEntry( "package2", "label2", /*consumePower=*/ 25.0, @@ -791,7 +783,7 @@ public class DataProcessorTest { /*backgroundUsageConsumePower=*/ 5, /*cachedUsageConsumePower=*/ 0, /*uid=*/ 3L, currentUserId + 2, ConvertUtils.CONSUMER_TYPE_UID_BATTERY, /*foregroundUsageTimeInMs=*/ 30L, - /*foregroundServiceUsageTimeInMs=*/ 35L, /*backgroundUsageTimeInMs=*/ 30L); + /*backgroundUsageTimeInMs=*/ 30L); entryMap.put(entry.getKey(), entry); batteryHistoryMap.put(batteryHistoryKeys[2], entryMap); final List hourlyBatteryLevelsPerDay = @@ -814,16 +806,14 @@ public class DataProcessorTest { ConvertUtils.CONSUMER_TYPE_UID_BATTERY, /*consumePercentage=*/ 25.0, /*foregroundUsageConsumePower=*/ 5, /*foregroundServiceUsageConsumePower=*/ 5, /*backgroundUsageConsumePower=*/ 5, /*cachedUsageConsumePower=*/ 5, - /*foregroundUsageTimeInMs=*/ 10, /*foregroundServiceUsageTimeInMs=*/ 15, - /*backgroundUsageTimeInMs=*/ 10); + /*foregroundUsageTimeInMs=*/ 10, /*backgroundUsageTimeInMs=*/ 10); assertBatteryDiffEntry( resultDiffData.getSystemDiffEntryList().get(0), BatteryUtils.UID_OTHER_USERS, /*uid=*/ BatteryUtils.UID_OTHER_USERS, ConvertUtils.CONSUMER_TYPE_UID_BATTERY, /*consumePercentage=*/ 75.0, /*foregroundUsageConsumePower=*/ 0, /*foregroundServiceUsageConsumePower=*/ 0, /*backgroundUsageConsumePower=*/ 0, /*cachedUsageConsumePower=*/ 0, - /*foregroundUsageTimeInMs=*/ 0, /*foregroundServiceUsageTimeInMs=*/ 0, - /*backgroundUsageTimeInMs=*/ 0); + /*foregroundUsageTimeInMs=*/ 0, /*backgroundUsageTimeInMs=*/ 0); assertThat(resultMap.get(0).get(0)).isNotNull(); assertThat(resultMap.get(0).get(DataProcessor.SELECTED_INDEX_ALL)).isNotNull(); verify(mMetricsFeatureProvider) @@ -853,7 +843,7 @@ public class DataProcessorTest { /*backgroundUsageConsumePower=*/ 0, /*cachedUsageConsumePower=*/ 0, /*uid=*/ 1L, currentUserId, ConvertUtils.CONSUMER_TYPE_UID_BATTERY, /*foregroundUsageTimeInMs=*/ 0L, - /*foregroundServiceUsageTimeInMs=*/ 0L, /*backgroundUsageTimeInMs=*/ 0L); + /*backgroundUsageTimeInMs=*/ 0L); entryMap.put(entry.getKey(), entry); batteryHistoryMap.put(batteryHistoryKeys[0], entryMap); // Adds the index = 1 data. @@ -864,7 +854,7 @@ public class DataProcessorTest { /*backgroundUsageConsumePower=*/ 0, /*cachedUsageConsumePower=*/ 0, /*uid=*/ 1L, currentUserId, ConvertUtils.CONSUMER_TYPE_UID_BATTERY, /*foregroundUsageTimeInMs=*/ 0L, - /*foregroundServiceUsageTimeInMs=*/ 0L, /*backgroundUsageTimeInMs=*/ 0L); + /*backgroundUsageTimeInMs=*/ 0L); entryMap.put(entry.getKey(), entry); batteryHistoryMap.put(batteryHistoryKeys[1], entryMap); // Adds the index = 2 data. @@ -875,7 +865,6 @@ public class DataProcessorTest { /*backgroundUsageConsumePower=*/ 100, /*cachedUsageConsumePower=*/ 100, /*uid=*/ 1L, currentUserId, ConvertUtils.CONSUMER_TYPE_UID_BATTERY, /*foregroundUsageTimeInMs=*/ 3600000L, - /*foregroundServiceUsageTimeInMs=*/ 1800000L, /*backgroundUsageTimeInMs=*/ 7200000L); entryMap.put(entry.getKey(), entry); batteryHistoryMap.put(batteryHistoryKeys[2], entryMap); @@ -899,8 +888,6 @@ public class DataProcessorTest { final BatteryDiffEntry resultEntry = resultDiffData.getAppDiffEntryList().get(0); assertThat(resultEntry.mForegroundUsageTimeInMs) .isEqualTo(Math.round(entry.mForegroundUsageTimeInMs * ratio)); - assertThat(resultEntry.mForegroundServiceUsageTimeInMs) - .isEqualTo(Math.round(entry.mForegroundServiceUsageTimeInMs * ratio)); assertThat(resultEntry.mBackgroundUsageTimeInMs) .isEqualTo(Math.round(entry.mBackgroundUsageTimeInMs * ratio)); assertThat(resultEntry.mConsumePower) @@ -942,7 +929,7 @@ public class DataProcessorTest { /*backgroundUsageConsumePower=*/ 0, /*cachedUsageConsumePower=*/ 0, /*uid=*/ 1L, currentUserId, ConvertUtils.CONSUMER_TYPE_UID_BATTERY, /*foregroundUsageTimeInMs=*/ 0L, - /*foregroundServiceUsageTimeInMs=*/ 0L, /*backgroundUsageTimeInMs=*/ 0L); + /*backgroundUsageTimeInMs=*/ 0L); entryMap.put(entry.getKey(), entry); entry = createBatteryHistEntry( "package2", "label2", /*consumePower=*/ 0, @@ -950,7 +937,7 @@ public class DataProcessorTest { /*backgroundUsageConsumePower=*/ 0, /*cachedUsageConsumePower=*/ 0, /*uid=*/ 2L, currentUserId, ConvertUtils.CONSUMER_TYPE_UID_BATTERY, /*foregroundUsageTimeInMs=*/ 0L, - /*foregroundServiceUsageTimeInMs=*/ 0L, /*backgroundUsageTimeInMs=*/ 0L); + /*backgroundUsageTimeInMs=*/ 0L); entryMap.put(entry.getKey(), entry); batteryHistoryMap.put(batteryHistoryKeys[0], entryMap); // Adds the index = 1 data. @@ -961,7 +948,7 @@ public class DataProcessorTest { /*backgroundUsageConsumePower=*/ 0, /*cachedUsageConsumePower=*/ 0, /*uid=*/ 1L, currentUserId, ConvertUtils.CONSUMER_TYPE_UID_BATTERY, /*foregroundUsageTimeInMs=*/ 0L, - /*foregroundServiceUsageTimeInMs=*/ 0L, /*backgroundUsageTimeInMs=*/ 0L); + /*backgroundUsageTimeInMs=*/ 0L); entryMap.put(entry.getKey(), entry); entry = createBatteryHistEntry( "package2", "label2", /*consumePower=*/ 0, @@ -969,7 +956,7 @@ public class DataProcessorTest { /*backgroundUsageConsumePower=*/ 0, /*cachedUsageConsumePower=*/ 0, /*uid=*/ 2L, currentUserId, ConvertUtils.CONSUMER_TYPE_UID_BATTERY, /*foregroundUsageTimeInMs=*/ 0L, - /*foregroundServiceUsageTimeInMs=*/ 0L, /*backgroundUsageTimeInMs=*/ 0L); + /*backgroundUsageTimeInMs=*/ 0L); entryMap.put(entry.getKey(), entry); batteryHistoryMap.put(batteryHistoryKeys[1], entryMap); // Adds the index = 2 data. @@ -980,7 +967,7 @@ public class DataProcessorTest { /*backgroundUsageConsumePower=*/ 0, /*cachedUsageConsumePower=*/ 0, /*uid=*/ 1L, currentUserId, ConvertUtils.CONSUMER_TYPE_UID_BATTERY, /*foregroundUsageTimeInMs=*/ 10L, - /*foregroundServiceUsageTimeInMs=*/ 15L, /*backgroundUsageTimeInMs=*/ 20L); + /*backgroundUsageTimeInMs=*/ 20L); entryMap.put(entry.getKey(), entry); entry = createBatteryHistEntry( "package2", "label2", /*consumePower=*/ 10.0, @@ -988,7 +975,7 @@ public class DataProcessorTest { /*backgroundUsageConsumePower=*/ 5, /*cachedUsageConsumePower=*/ 5, /*uid=*/ 2L, currentUserId, ConvertUtils.CONSUMER_TYPE_UID_BATTERY, /*foregroundUsageTimeInMs=*/ 10L, - /*foregroundServiceUsageTimeInMs=*/ 15L, /*backgroundUsageTimeInMs=*/ 20L); + /*backgroundUsageTimeInMs=*/ 20L); entryMap.put(entry.getKey(), entry); batteryHistoryMap.put(batteryHistoryKeys[2], entryMap); final List hourlyBatteryLevelsPerDay = @@ -1013,8 +1000,7 @@ public class DataProcessorTest { ConvertUtils.CONSUMER_TYPE_UID_BATTERY, /*consumePercentage=*/ 50.0, /*foregroundUsageConsumePower=*/ 0, /*foregroundServiceUsageConsumePower=*/ 0, /*backgroundUsageConsumePower=*/ 5, /*cachedUsageConsumePower=*/ 5, - /*foregroundUsageTimeInMs=*/ 10, /*foregroundServiceUsageTimeInMs=*/ 15, - /*backgroundUsageTimeInMs=*/ 20); + /*foregroundUsageTimeInMs=*/ 10, /*backgroundUsageTimeInMs=*/ 20); verify(mMetricsFeatureProvider) .action(mContext.getApplicationContext(), SettingsEnums.ACTION_BATTERY_USAGE_SHOWN_APP_COUNT, @@ -1042,7 +1028,7 @@ public class DataProcessorTest { /*backgroundUsageConsumePower=*/ 0, /*cachedUsageConsumePower=*/ 0, /*uid=*/ 1L, currentUserId, ConvertUtils.CONSUMER_TYPE_UID_BATTERY, /*foregroundUsageTimeInMs=*/ 0L, - /*foregroundServiceUsageTimeInMs=*/ 0L, /*backgroundUsageTimeInMs=*/ 0L); + /*backgroundUsageTimeInMs=*/ 0L); entryMap.put(entry.getKey(), entry); entry = createBatteryHistEntry( "package2", "label2", /*consumePower=*/ 0, @@ -1050,7 +1036,7 @@ public class DataProcessorTest { /*backgroundUsageConsumePower=*/ 0, /*cachedUsageConsumePower=*/ 0, /*uid=*/ 2L, currentUserId, ConvertUtils.CONSUMER_TYPE_UID_BATTERY, /*foregroundUsageTimeInMs=*/ 0L, - /*foregroundServiceUsageTimeInMs=*/ 0L, /*backgroundUsageTimeInMs=*/ 0L); + /*backgroundUsageTimeInMs=*/ 0L); entryMap.put(entry.getKey(), entry); batteryHistoryMap.put(batteryHistoryKeys[0], entryMap); // Adds the index = 1 data. @@ -1061,7 +1047,7 @@ public class DataProcessorTest { /*backgroundUsageConsumePower=*/ 0, /*cachedUsageConsumePower=*/ 0, /*uid=*/ 1L, currentUserId, ConvertUtils.CONSUMER_TYPE_UID_BATTERY, /*foregroundUsageTimeInMs=*/ 0L, - /*foregroundServiceUsageTimeInMs=*/ 0L, /*backgroundUsageTimeInMs=*/ 0L); + /*backgroundUsageTimeInMs=*/ 0L); entryMap.put(entry.getKey(), entry); entry = createBatteryHistEntry( "package2", "label2", /*consumePower=*/ 0, @@ -1069,7 +1055,7 @@ public class DataProcessorTest { /*backgroundUsageConsumePower=*/ 0, /*cachedUsageConsumePower=*/ 0, /*uid=*/ 2L, currentUserId, ConvertUtils.CONSUMER_TYPE_UID_BATTERY, /*foregroundUsageTimeInMs=*/ 0L, - /*foregroundServiceUsageTimeInMs=*/ 0L, /*backgroundUsageTimeInMs=*/ 0L); + /*backgroundUsageTimeInMs=*/ 0L); entryMap.put(entry.getKey(), entry); batteryHistoryMap.put(batteryHistoryKeys[1], entryMap); // Adds the index = 2 data. @@ -1080,7 +1066,7 @@ public class DataProcessorTest { /*backgroundUsageConsumePower=*/ 0, /*cachedUsageConsumePower=*/ 0, /*uid=*/ 1L, currentUserId, ConvertUtils.CONSUMER_TYPE_UID_BATTERY, /*foregroundUsageTimeInMs=*/ 10L, - /*foregroundServiceUsageTimeInMs=*/ 15L, /*backgroundUsageTimeInMs=*/ 20L); + /*backgroundUsageTimeInMs=*/ 20L); entryMap.put(entry.getKey(), entry); entry = createBatteryHistEntry( "package2", "label2", /*consumePower=*/ 10.0, @@ -1088,7 +1074,7 @@ public class DataProcessorTest { /*backgroundUsageConsumePower=*/ 5, /*cachedUsageConsumePower=*/ 5, /*uid=*/ 2L, currentUserId, ConvertUtils.CONSUMER_TYPE_UID_BATTERY, /*foregroundUsageTimeInMs=*/ 10L, - /*foregroundServiceUsageTimeInMs=*/ 15L, /*backgroundUsageTimeInMs=*/ 20L); + /*backgroundUsageTimeInMs=*/ 20L); entryMap.put(entry.getKey(), entry); batteryHistoryMap.put(batteryHistoryKeys[2], entryMap); final List hourlyBatteryLevelsPerDay = @@ -1141,7 +1127,6 @@ public class DataProcessorTest { doReturn(0.0).when(mMockBatteryEntry1).getConsumedPowerInBackground(); doReturn(0.0).when(mMockBatteryEntry1).getConsumedPowerInCached(); doReturn(30L).when(mMockBatteryEntry1).getTimeInForegroundMs(); - doReturn(20L).when(mMockBatteryEntry1).getTimeInForegroundServiceMs(); doReturn(40L).when(mMockBatteryEntry1).getTimeInBackgroundMs(); doReturn(1).when(mMockBatteryEntry1).getUid(); doReturn(ConvertUtils.CONSUMER_TYPE_UID_BATTERY).when(mMockBatteryEntry1).getConsumerType(); @@ -1151,7 +1136,6 @@ public class DataProcessorTest { doReturn(0.0).when(mMockBatteryEntry2).getConsumedPowerInBackground(); doReturn(0.0).when(mMockBatteryEntry2).getConsumedPowerInCached(); doReturn(20L).when(mMockBatteryEntry2).getTimeInForegroundMs(); - doReturn(30L).when(mMockBatteryEntry2).getTimeInForegroundServiceMs(); doReturn(20L).when(mMockBatteryEntry2).getTimeInBackgroundMs(); doReturn(2).when(mMockBatteryEntry2).getUid(); doReturn(ConvertUtils.CONSUMER_TYPE_UID_BATTERY).when(mMockBatteryEntry2).getConsumerType(); @@ -1161,7 +1145,6 @@ public class DataProcessorTest { doReturn(0.0).when(mMockBatteryEntry3).getConsumedPowerInBackground(); doReturn(0.0).when(mMockBatteryEntry3).getConsumedPowerInCached(); doReturn(0L).when(mMockBatteryEntry3).getTimeInForegroundMs(); - doReturn(0L).when(mMockBatteryEntry3).getTimeInForegroundServiceMs(); doReturn(0L).when(mMockBatteryEntry3).getTimeInBackgroundMs(); doReturn(3).when(mMockBatteryEntry3).getUid(); doReturn(ConvertUtils.CONSUMER_TYPE_UID_BATTERY).when(mMockBatteryEntry3).getConsumerType(); @@ -1171,7 +1154,6 @@ public class DataProcessorTest { doReturn(0.3).when(mMockBatteryEntry4).getConsumedPowerInBackground(); doReturn(0.1).when(mMockBatteryEntry4).getConsumedPowerInCached(); doReturn(10L).when(mMockBatteryEntry4).getTimeInForegroundMs(); - doReturn(15L).when(mMockBatteryEntry4).getTimeInForegroundServiceMs(); doReturn(10L).when(mMockBatteryEntry4).getTimeInBackgroundMs(); doReturn(4).when(mMockBatteryEntry4).getUid(); doReturn(ConvertUtils.CONSUMER_TYPE_SYSTEM_BATTERY) @@ -1187,22 +1169,19 @@ public class DataProcessorTest { ConvertUtils.CONSUMER_TYPE_UID_BATTERY, /*consumePercentage=*/ 25.0, /*foregroundUsageConsumePower=*/ 0.5, /*foregroundServiceUsageConsumePower=*/ 0, /*backgroundUsageConsumePower=*/ 0, /*cachedUsageConsumePower=*/ 0, - /*foregroundUsageTimeInMs=*/ 20, /*foregroundServiceUsageTimeInMs=*/ 30, - /*backgroundUsageTimeInMs=*/ 20); + /*foregroundUsageTimeInMs=*/ 20, /*backgroundUsageTimeInMs=*/ 20); assertBatteryDiffEntry( batteryDiffData.getAppDiffEntryList().get(1), 0, /*uid=*/ 1L, ConvertUtils.CONSUMER_TYPE_UID_BATTERY, /*consumePercentage=*/ 0.0, /*foregroundUsageConsumePower=*/ 0, /*foregroundServiceUsageConsumePower=*/ 0, /*backgroundUsageConsumePower=*/ 0, /*cachedUsageConsumePower=*/ 0, - /*foregroundUsageTimeInMs=*/ 30, /*foregroundServiceUsageTimeInMs=*/ 20, - /*backgroundUsageTimeInMs=*/ 40); + /*foregroundUsageTimeInMs=*/ 30, /*backgroundUsageTimeInMs=*/ 40); assertBatteryDiffEntry( batteryDiffData.getSystemDiffEntryList().get(0), 0, /*uid=*/ 4L, ConvertUtils.CONSUMER_TYPE_SYSTEM_BATTERY, /*consumePercentage=*/ 75.0, /*foregroundUsageConsumePower=*/ 0.9, /*foregroundServiceUsageConsumePower=*/ 0.2, /*backgroundUsageConsumePower=*/ 0.3, /*cachedUsageConsumePower=*/ 0.1, - /*foregroundUsageTimeInMs=*/ 10, /*foregroundServiceUsageTimeInMs=*/ 15, - /*backgroundUsageTimeInMs=*/ 10); + /*foregroundUsageTimeInMs=*/ 10, /*backgroundUsageTimeInMs=*/ 10); } private static Map> createHistoryMap( @@ -1241,8 +1220,7 @@ public class DataProcessorTest { final double foregroundServiceUsageConsumePower, final double backgroundUsageConsumePower, final double cachedUsageConsumePower, final long uid, final long userId, final int consumerType, - final long foregroundUsageTimeInMs, final long foregroundServiceUsageTimeInMs, - final long backgroundUsageTimeInMs) { + final long foregroundUsageTimeInMs, final long backgroundUsageTimeInMs) { // Only insert required fields. final BatteryInformation batteryInformation = BatteryInformation @@ -1254,7 +1232,6 @@ public class DataProcessorTest { .setBackgroundUsageConsumePower(backgroundUsageConsumePower) .setCachedUsageConsumePower(cachedUsageConsumePower) .setForegroundUsageTimeInMs(foregroundUsageTimeInMs) - .setForegroundServiceUsageTimeInMs(foregroundServiceUsageTimeInMs) .setBackgroundUsageTimeInMs(backgroundUsageTimeInMs) .build(); final ContentValues values = new ContentValues(); @@ -1333,8 +1310,7 @@ public class DataProcessorTest { final double foregroundUsageConsumePower, final double foregroundServiceUsageConsumePower, final double backgroundUsageConsumePower, final double cachedUsageConsumePower, - final long foregroundUsageTimeInMs, final long foregroundServiceUsageTimeInMs, - final long backgroundUsageTimeInMs) { + final long foregroundUsageTimeInMs, final long backgroundUsageTimeInMs) { assertThat(entry.mBatteryHistEntry.mUserId).isEqualTo(userId); assertThat(entry.mBatteryHistEntry.mUid).isEqualTo(uid); assertThat(entry.mBatteryHistEntry.mConsumerType).isEqualTo(consumerType); @@ -1345,8 +1321,6 @@ public class DataProcessorTest { assertThat(entry.mBackgroundUsageConsumePower).isEqualTo(backgroundUsageConsumePower); assertThat(entry.mCachedUsageConsumePower).isEqualTo(cachedUsageConsumePower); assertThat(entry.mForegroundUsageTimeInMs).isEqualTo(foregroundUsageTimeInMs); - assertThat(entry.mForegroundServiceUsageTimeInMs) - .isEqualTo(foregroundServiceUsageTimeInMs); assertThat(entry.mBackgroundUsageTimeInMs).isEqualTo(backgroundUsageTimeInMs); } } diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/db/BatteryStateTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/db/BatteryStateTest.java index 002e4fd1df4..9b9003e3ebe 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/db/BatteryStateTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/db/BatteryStateTest.java @@ -63,7 +63,6 @@ public final class BatteryStateTest { .setPercentOfTotal(10) .setDrainType(1) .setForegroundUsageTimeInMs(60000) - .setForegroundServiceUsageTimeInMs(30000) .setBackgroundUsageTimeInMs(10000) .build(); } diff --git a/tests/robotests/src/com/android/settings/testutils/BatteryTestUtils.java b/tests/robotests/src/com/android/settings/testutils/BatteryTestUtils.java index 485caef1c9e..f119d6e6b2e 100644 --- a/tests/robotests/src/com/android/settings/testutils/BatteryTestUtils.java +++ b/tests/robotests/src/com/android/settings/testutils/BatteryTestUtils.java @@ -107,7 +107,6 @@ public class BatteryTestUtils { .setPercentOfTotal(10f) .setDrainType(1) .setForegroundUsageTimeInMs(60000) - .setForegroundServiceUsageTimeInMs(30000) .setBackgroundUsageTimeInMs(10000) .setForegroundUsageConsumePower(0.1f) .setForegroundServiceUsageConsumePower(0.05f)