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

Commit 78af7fc7 authored by Sudheer Shanka's avatar Sudheer Shanka Committed by Automerger Merge Worker
Browse files

Merge "Include uid in batterystats logs." into sc-dev am: b1b9e932 

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

Change-Id: Id75fb443a61bacee1e314d00deb50e46128cbe77
parents df6e4826 b1b9e932

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

+6 −3
Original line number Diff line number Diff line
@@ -482,7 +482,8 @@ public abstract class KernelCpuUidTimeReader<T> { 
                // Unit is 10ms.

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

                if (mDeltaTimes[i] < 0) {

                    Slog.e(mTag, "Negative delta from freq time proc: " + mDeltaTimes[i]);

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

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

                    valid = false;

                }

                notify |= mDeltaTimes[i] > 0;
@@ -648,7 +649,8 @@ public abstract class KernelCpuUidTimeReader<T> { 
                        cb.onUidCpuTime(uid, delta);

                    }

                } else if (delta < 0) {

                    Slog.e(mTag, "Negative delta from active time proc: " + delta);

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

                            + ", delta: " + delta);

                }

            }

        }
@@ -822,7 +824,8 @@ public abstract class KernelCpuUidTimeReader<T> { 
            for (int i = 0; i < mNumClusters; i++) {

                mDeltaTime[i] = mCurTime[i] - lastTimes[i];

                if (mDeltaTime[i] < 0) {

                    Slog.e(mTag, "Negative delta from cluster time proc: " + mDeltaTime[i]);

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

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

                    valid = false;

                }

                notify |= mDeltaTime[i] > 0;