Merge "Update the internal state before sending the deltas to callback." (f7431feb) · Commits · e / os / android_frameworks_base

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

+7 −5

Original line number	Diff line number	Diff line
		@@ -78,10 +78,11 @@ public class KernelUidCpuTimeReader {
		final long userTimeUs = Long.parseLong(splitter.next(), 10);
		final long systemTimeUs = Long.parseLong(splitter.next(), 10);

		// Only report if there is a callback and if this is not the first read.
		if (callback != null && mLastTimeReadUs != 0) {
		boolean notifyCallback = false;
		long userTimeDeltaUs = userTimeUs;
		long systemTimeDeltaUs = systemTimeUs;
		// Only report if there is a callback and if this is not the first read.
		if (callback != null && mLastTimeReadUs != 0) {
		int index = mLastUserTimeUs.indexOfKey(uid);
		if (index >= 0) {
		userTimeDeltaUs -= mLastUserTimeUs.valueAt(index);
		@@ -114,12 +115,13 @@ public class KernelUidCpuTimeReader {
		}
		}

		if (userTimeDeltaUs != 0 \|\| systemTimeDeltaUs != 0) {
		callback.onUidCpuTime(uid, userTimeDeltaUs, systemTimeDeltaUs);
		}
		notifyCallback = (userTimeDeltaUs != 0 \|\| systemTimeDeltaUs != 0);
		}
		mLastUserTimeUs.put(uid, userTimeUs);
		mLastSystemTimeUs.put(uid, systemTimeUs);
		if (notifyCallback) {
		callback.onUidCpuTime(uid, userTimeDeltaUs, systemTimeDeltaUs);
		}
		}
		} catch (IOException e) {
		Slog.e(TAG, "Failed to read uid_cputime: " + e.getMessage());