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

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

Change-Id: I8b00c6631a668e90ba97dbe7222cdeb6b64fa06d
This commit is contained in:
TreeHugger Robot
2021-07-14 02:22:10 +00:00
committed by Automerger Merge Worker

View File

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