Merge "Ignore entries for isolated uids if there's no mapping for them." into oc-dev (057bad9c) · Commits · e / os / android_frameworks_base

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

+15 −2

Original line number	Original line	Diff line number	Diff line
	@@ -10175,7 +10175,16 @@ public class BatteryStatsImpl extends BatteryStats {
	new KernelUidCpuTimeReader.Callback() {		new KernelUidCpuTimeReader.Callback() {
	@Override		@Override
	public void onUidCpuTime(int uid, long userTimeUs, long systemTimeUs) {		public void onUidCpuTime(int uid, long userTimeUs, long systemTimeUs) {
	final Uid u = getUidStatsLocked(mapUid(uid));		uid = mapUid(uid);
			if (Process.isIsolated(uid)) {
			// This could happen if the isolated uid mapping was removed before
			// that process was actually killed.
			mKernelUidCpuTimeReader.removeUid(uid);
			Slog.d(TAG, "Got readings for an isolated uid with"
			+ " no mapping to owning uid: " + uid);
			return;
			}
			final Uid u = getUidStatsLocked(uid);

	// Accumulate the total system and user time.		// Accumulate the total system and user time.
	mTempTotalCpuUserTimeUs += userTimeUs;		mTempTotalCpuUserTimeUs += userTimeUs;
	@@ -10340,7 +10349,11 @@ public class BatteryStatsImpl extends BatteryStats {

	@Override		@Override
	public void onUidCpuFreqTime(int uid, long[] cpuFreqTimeMs) {		public void onUidCpuFreqTime(int uid, long[] cpuFreqTimeMs) {
	final Uid u = getUidStatsLocked(mapUid(uid));		uid = mapUid(uid);
			if (Process.isIsolated(uid)) {
			return;
			}
			final Uid u = getUidStatsLocked(uid);
	if (u.mCpuFreqTimeMs == null) {		if (u.mCpuFreqTimeMs == null) {
	u.mCpuFreqTimeMs = new LongSamplingCounterArray(mOnBatteryTimeBase);		u.mCpuFreqTimeMs = new LongSamplingCounterArray(mOnBatteryTimeBase);
	}		}