Merge "Removed logging ProcessMemoryStatReported atom to statsd" into main (2cdda47d) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/am/ActivityManagerService.java

+0 −50

Original line number	Diff line number	Diff line
		@@ -4201,21 +4201,6 @@ public class ActivityManagerService extends IActivityManager.Stub
		profile.addPss(mi.getTotalPss(),
		mi.getTotalUss(), mi.getTotalRss(), false,
		ProcessStats.ADD_PSS_EXTERNAL_SLOW, duration);
		proc.getPkgList().forEachPackageProcessStats(holder -> {
		final ProcessState state = holder.state;
		FrameworkStatsLog.write(FrameworkStatsLog.PROCESS_MEMORY_STAT_REPORTED,
		proc.info.uid,
		state != null ? state.getName() : proc.processName,
		state != null ? state.getPackage() : proc.info.packageName,
		mi.getTotalPss(),
		mi.getTotalUss(),
		mi.getTotalRss(),
		ProcessStats.ADD_PSS_EXTERNAL_SLOW,
		duration,
		holder.appVersion,
		profile.getCurrentHostingComponentTypes(),
		profile.getHistoricalHostingComponentTypes());
		});
		}
		}
		}
		@@ -4262,20 +4247,6 @@ public class ActivityManagerService extends IActivityManager.Stub
		// Record this for posterity if the process has been stable.
		profile.addPss(pi, tmpUss[0], tmpUss[2], false,
		ProcessStats.ADD_PSS_EXTERNAL, duration);
		proc.getPkgList().forEachPackageProcessStats(holder -> {
		FrameworkStatsLog.write(FrameworkStatsLog.PROCESS_MEMORY_STAT_REPORTED,
		proc.info.uid,
		holder.state.getName(),
		holder.state.getPackage(),
		pi,
		tmpUss[0],
		tmpUss[2],
		ProcessStats.ADD_PSS_EXTERNAL,
		duration,
		holder.appVersion,
		profile.getCurrentHostingComponentTypes(),
		profile.getHistoricalHostingComponentTypes());
		});
		}
		}
		}
		@@ -11411,17 +11382,6 @@ public class ActivityManagerService extends IActivityManager.Stub
		// Record this for posterity if the process has been stable.
		r.mProfile.addPss(myTotalPss, myTotalUss, myTotalRss, true,
		reportType, endTime - startTime);
		r.getPkgList().forEachPackageProcessStats(holder -> {
		FrameworkStatsLog.write(FrameworkStatsLog.PROCESS_MEMORY_STAT_REPORTED,
		r.info.uid,
		holder.state.getName(),
		holder.state.getPackage(),
		myTotalPss, myTotalUss, myTotalRss, reportType,
		endTime-startTime,
		holder.appVersion,
		r.mProfile.getCurrentHostingComponentTypes(),
		r.mProfile.getHistoricalHostingComponentTypes());
		});
		}
		}

		@@ -12057,16 +12017,6 @@ public class ActivityManagerService extends IActivityManager.Stub
		// Record this for posterity if the process has been stable.
		r.mProfile.addPss(myTotalPss, myTotalUss, myTotalRss, true,
		reportType, endTime - startTime);
		r.getPkgList().forEachPackageProcessStats(holder -> {
		FrameworkStatsLog.write(FrameworkStatsLog.PROCESS_MEMORY_STAT_REPORTED,
		r.info.uid,
		holder.state.getName(),
		holder.state.getPackage(),
		myTotalPss, myTotalUss, myTotalRss, reportType, endTime-startTime,
		holder.appVersion,
		r.mProfile.getCurrentHostingComponentTypes(),
		r.mProfile.getHistoricalHostingComponentTypes());
		});
		}
		}

services/core/java/com/android/server/am/AppProfiler.java

+0 −11

Original line number	Diff line number	Diff line
		@@ -567,17 +567,6 @@ public class AppProfiler {
		swapPss * 1024, rss * 1024, statType, procState, pssDuration);
		profile.setLastPssTime(now);
		profile.addPss(pss, uss, rss, true, statType, pssDuration);
		proc.getPkgList().forEachPackageProcessStats(holder -> {
		FrameworkStatsLog.write(FrameworkStatsLog.PROCESS_MEMORY_STAT_REPORTED,
		proc.info.uid,
		holder.state.getName(),
		holder.state.getPackage(),
		pss, uss, rss,
		statType, pssDuration,
		holder.appVersion,
		profile.getCurrentHostingComponentTypes(),
		profile.getHistoricalHostingComponentTypes());
		});
		if (DEBUG_PSS) {
		Slog.d(TAG_PSS,
		"pss of " + proc.toShortString() + ": " + pss