Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9b3e809d authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix BstatsCpuTimesValidationTest.testCpuFreqTimes_trackingDisabled"... 

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

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

Change-Id: I1a4800d8a709705c1739548dcb71e449a34e0ebe
parents 47dc082e f7aca051

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

+3 −3
Original line number Original line Diff line number Diff line
@@ -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 {