Merge "Remove references to POWER_COMPONENT_USAGE and TIME_COMPONENT_USAGE" into sc-dev

This commit is contained in:
Dmitri Plotnikov
2021-04-14 17:50:25 +00:00
committed by Android (Google) Code Review
3 changed files with 15 additions and 15 deletions

View File

@@ -28,7 +28,6 @@ import android.content.Context;
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager;
import android.content.pm.PackageManager.NameNotFoundException;
import android.os.BatteryConsumer;
import android.os.Handler;
import android.os.Process;
import android.os.SystemBatteryConsumer;
@@ -178,8 +177,7 @@ public class BatteryEntryTest {
final BatteryEntry entry = new BatteryEntry(RuntimeEnvironment.application, mockHandler,
mockUserManager, mSystemBatteryConsumer, false, null, null);
when(mSystemBatteryConsumer.getUsageDurationMillis(BatteryConsumer.TIME_COMPONENT_USAGE))
.thenReturn(100L);
when(mSystemBatteryConsumer.getUsageDurationMillis()).thenReturn(100L);
assertThat(entry.getTimeInForegroundMs()).isEqualTo(100L);
}
@@ -200,7 +198,7 @@ public class BatteryEntryTest {
final BatteryEntry entry = new BatteryEntry(RuntimeEnvironment.application, mockHandler,
mockUserManager, mSystemBatteryConsumer, false, null, null);
when(mSystemBatteryConsumer.getUsageDurationMillis(BatteryConsumer.TIME_COMPONENT_USAGE))
when(mSystemBatteryConsumer.getUsageDurationMillis())
.thenReturn(100L);
assertThat(entry.getTimeInBackgroundMs()).isEqualTo(0);