Merge "Fix BatteryStatsImplTest." into sc-dev am: 4162c032bf am: d6956bc287
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15291010
Change-Id: I19bc29d6bf83c8d077e9b8961fcc41100edf3f27
diff --git a/core/java/com/android/internal/os/BatteryStatsImpl.java b/core/java/com/android/internal/os/BatteryStatsImpl.java
index 3594e64..84ef5a1 100644
--- a/core/java/com/android/internal/os/BatteryStatsImpl.java
+++ b/core/java/com/android/internal/os/BatteryStatsImpl.java
@@ -1106,8 +1106,9 @@
@VisibleForTesting
protected PowerProfile mPowerProfile;
+ @VisibleForTesting
@GuardedBy("this")
- final Constants mConstants;
+ protected final Constants mConstants;
/*
* Holds a SamplingTimer associated with each Resource Power Manager state and voter,
diff --git a/core/tests/coretests/src/com/android/internal/os/BatteryStatsImplTest.java b/core/tests/coretests/src/com/android/internal/os/BatteryStatsImplTest.java
index 24baa93..cca6642 100644
--- a/core/tests/coretests/src/com/android/internal/os/BatteryStatsImplTest.java
+++ b/core/tests/coretests/src/com/android/internal/os/BatteryStatsImplTest.java
@@ -69,11 +69,11 @@
when(mKernelSingleUidTimeReader.singleUidCpuTimesAvailable()).thenReturn(true);
mBatteryStatsImpl = new MockBatteryStatsImpl()
.setKernelCpuUidFreqTimeReader(mKernelUidCpuFreqTimeReader)
- .setKernelSingleUidTimeReader(mKernelSingleUidTimeReader);
+ .setKernelSingleUidTimeReader(mKernelSingleUidTimeReader)
+ .setTrackingCpuByProcStateEnabled(true);
}
@Test
- @SkipPresubmit("b/180015146")
public void testUpdateProcStateCpuTimes() {
mBatteryStatsImpl.setOnBatteryInternal(true);
mBatteryStatsImpl.updateTimeBasesLocked(false, Display.STATE_ON, 0, 0);
@@ -231,7 +231,6 @@
}
@Test
- @SkipPresubmit("b/180015146")
public void testCopyFromAllUidsCpuTimes() {
mBatteryStatsImpl.setOnBatteryInternal(false);
mBatteryStatsImpl.updateTimeBasesLocked(false, Display.STATE_ON, 0, 0);
diff --git a/core/tests/coretests/src/com/android/internal/os/MockBatteryStatsImpl.java b/core/tests/coretests/src/com/android/internal/os/MockBatteryStatsImpl.java
index 80def71..99d576d 100644
--- a/core/tests/coretests/src/com/android/internal/os/MockBatteryStatsImpl.java
+++ b/core/tests/coretests/src/com/android/internal/os/MockBatteryStatsImpl.java
@@ -174,6 +174,11 @@
return this;
}
+ public MockBatteryStatsImpl setTrackingCpuByProcStateEnabled(boolean enabled) {
+ mConstants.TRACK_CPU_TIMES_BY_PROC_STATE = enabled;
+ return this;
+ }
+
public SparseIntArray getPendingUids() {
return mPendingUids;
}