From 21dd5325fb855628691d5af62e09f4989e809c62 Mon Sep 17 00:00:00 2001 From: Dmitri Plotnikov Date: Wed, 14 Jul 2021 17:39:56 -0700 Subject: Fix BatteryStatsImplTest. Bug: 180015146 Test: atest FrameworksCoreTests:BatteryStatsImplTest Change-Id: I6b43ca03ba816e12735ebd47d8cf61a6b1cee110 --- core/java/com/android/internal/os/BatteryStatsImpl.java | 3 ++- .../coretests/src/com/android/internal/os/BatteryStatsImplTest.java | 5 ++--- .../coretests/src/com/android/internal/os/MockBatteryStatsImpl.java | 5 +++++ 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/core/java/com/android/internal/os/BatteryStatsImpl.java b/core/java/com/android/internal/os/BatteryStatsImpl.java index a68a007dad56..8c63f38494ea 100644 --- a/core/java/com/android/internal/os/BatteryStatsImpl.java +++ b/core/java/com/android/internal/os/BatteryStatsImpl.java @@ -1106,8 +1106,9 @@ public class BatteryStatsImpl extends BatteryStats { @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 24baa93337ba..cca66420c596 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 @@ public class BatteryStatsImplTest { 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 @@ public class BatteryStatsImplTest { } @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 80def71ce812..99d576d259ec 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 @@ public class MockBatteryStatsImpl extends BatteryStatsImpl { return this; } + public MockBatteryStatsImpl setTrackingCpuByProcStateEnabled(boolean enabled) { + mConstants.TRACK_CPU_TIMES_BY_PROC_STATE = enabled; + return this; + } + public SparseIntArray getPendingUids() { return mPendingUids; } -- cgit v1.2.3-59-g8ed1b