Merge "Include uid in batterystats logs." into sc-dev (b1b9e932) · Commits · e / os / android_frameworks_base

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;