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

Commit 649120cb authored by Connor O'Brien's avatar Connor O'Brien Committed by Automerger Merge Worker
Browse files

Merge "Log less on negative deltas in kernel CPU time readers" into sc-dev am: 0602a88a 

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

Change-Id: I2fe2b1da1b96678b2779ca7d472a645d57576544
parents f6e311c9 0602a88a

core/java/com/android/internal/os/KernelCpuUidTimeReader.java

+4 −5
Original line number Diff line number Diff line
@@ -477,18 +477,17 @@ public abstract class KernelCpuUidTimeReader<T> { 
            }

            copyToCurTimes();

            boolean notify = false;

            boolean valid = true;

            for (int i = 0; i < mFreqCount; i++) {

                // Unit is 10ms.

                mDeltaTimes[i] = mCurTimes[i] - lastTimes[i];

                if (mDeltaTimes[i] < 0) {

                    Slog.e(mTag, "Negative delta from freq time for uid: " + uid

                            + ", delta: " + mDeltaTimes[i]);

                    valid = false;

                    return;

                }

                notify |= mDeltaTimes[i] > 0;

            }

            if (notify && valid) {

            if (notify) {

                System.arraycopy(mCurTimes, 0, lastTimes, 0, mFreqCount);

                if (cb != null) {

                    cb.onUidCpuTime(uid, mDeltaTimes);
@@ -826,11 +825,11 @@ public abstract class KernelCpuUidTimeReader<T> { 
                if (mDeltaTime[i] < 0) {

                    Slog.e(mTag, "Negative delta from cluster time for uid: " + uid

                            + ", delta: " + mDeltaTime[i]);

                    valid = false;

                    return;

                }

                notify |= mDeltaTime[i] > 0;

            }

            if (notify && valid) {

            if (notify) {

                System.arraycopy(mCurTime, 0, lastTimes, 0, mNumClusters);

                if (cb != null) {

                    cb.onUidCpuTime(uid, mDeltaTime);