Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix BstatsCpuTimesValidationTest.testCpuFreqTimes_trackingDisabled" into sc-dev am: f7aca0513d

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15277354

Change-Id: I3e1ff9bea9b3bbaebb6988e0ed5321a79627e19e
This commit is contained in:
TreeHugger Robot
2021-07-14 01:50:07 +00:00
committed by Automerger Merge Worker
parent 992684e112 f7aca0513d
commit 7e3a4dc30b
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/tests/coretests/src/com/android/internal/os/BstatsCpuTimesValidationTest.java
View File

@@ -580,11 +580,11 @@ public class BstatsCpuTimesValidationTest {
final long[] cpuTimesMs4 = getAllCpuFreqTimes(sTestPkgUid, PROCESS_STATE_TOP); final long[] cpuTimesMs4 = getAllCpuFreqTimes(sTestPkgUid, PROCESS_STATE_TOP);
assertCpuTimesValid(cpuTimesMs4); assertCpuTimesValid(cpuTimesMs4);
actualCpuTimeMs = 0; actualCpuTimeMs = 0;
for (int i = 0; i < cpuTimesMs.length / 2; ++i) { for (int i = 0; i < cpuTimesMs4.length / 2; ++i) {
actualCpuTimeMs += cpuTimesMs[i]; actualCpuTimeMs += cpuTimesMs4[i];
} }
assertApproximateValue("Incorrect total cpu time, " + msgCpuTimes, assertApproximateValue("Incorrect total cpu time, " + msgCpuTimes,
WORK_DURATION_MS, actualCpuTimeMs); 2 * WORK_DURATION_MS, actualCpuTimeMs);
batteryOffScreenOn(); batteryOffScreenOn();
} finally { } finally {