Merge "Log annotations for pulled atoms." into rvc-dev am: c598ff319c (07eda491) · Commits · e / os / android_frameworks_base

cmds/statsd/src/atoms.proto

+3 −3

Original line number	Diff line number	Diff line
		@@ -5810,7 +5810,7 @@ message NotificationRemoteViews {
		*/
		message PackageNotificationPreferences {
		// Uid under which the package is installed.
		optional int32 uid = 1;
		optional int32 uid = 1 [(is_uid) = true];
		// Notification importance, which specifies when and how a notification is displayed.
		// Specified under core/java/android/app/NotificationManager.java.
		optional int32 importance = 2;
		@@ -5827,7 +5827,7 @@ message PackageNotificationPreferences {
		*/
		message PackageNotificationChannelPreferences {
		// Uid under which the package is installed.
		optional int32 uid = 1;
		optional int32 uid = 1 [(is_uid) = true];
		// Channel's ID. Should always be available.
		optional string channel_id = 2;
		// Channel's name. Should always be available.
		@@ -5850,7 +5850,7 @@ message PackageNotificationChannelPreferences {
		*/
		message PackageNotificationChannelGroupPreferences {
		// Uid under which the package is installed.
		optional int32 uid = 1;
		optional int32 uid = 1 [(is_uid) = true];
		// Channel Group's ID. Should always be available.
		optional string group_id = 2;
		// Channel Group's name. Should always be available.

services/core/java/com/android/server/notification/PreferencesHelper.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@ import static android.app.NotificationChannel.PLACEHOLDER_CONVERSATION_ID;
		import static android.app.NotificationManager.IMPORTANCE_NONE;
		import static android.app.NotificationManager.IMPORTANCE_UNSPECIFIED;

		import static com.android.internal.util.FrameworkStatsLog.ANNOTATION_ID_IS_UID;
		import static com.android.internal.util.FrameworkStatsLog.PACKAGE_NOTIFICATION_CHANNEL_GROUP_PREFERENCES;
		import static com.android.internal.util.FrameworkStatsLog.PACKAGE_NOTIFICATION_CHANNEL_PREFERENCES;
		import static com.android.internal.util.FrameworkStatsLog.PACKAGE_NOTIFICATION_PREFERENCES;
		@@ -1798,6 +1799,7 @@ public class PreferencesHelper implements RankingConfig {
		.setAtomId(PACKAGE_NOTIFICATION_PREFERENCES);
		final PackagePreferences r = mPackagePreferences.valueAt(i);
		event.writeInt(r.uid);
		event.addBooleanAnnotation(ANNOTATION_ID_IS_UID, true);
		event.writeInt(r.importance);
		event.writeInt(r.visibility);
		event.writeInt(r.lockedAppFields);
		@@ -1825,6 +1827,7 @@ public class PreferencesHelper implements RankingConfig {
		StatsEvent.Builder event = StatsEvent.newBuilder()
		.setAtomId(PACKAGE_NOTIFICATION_CHANNEL_PREFERENCES);
		event.writeInt(r.uid);
		event.addBooleanAnnotation(ANNOTATION_ID_IS_UID, true);
		event.writeString(channel.getId());
		event.writeString(channel.getName().toString());
		event.writeString(channel.getDescription());
		@@ -1856,6 +1859,7 @@ public class PreferencesHelper implements RankingConfig {
		StatsEvent.Builder event = StatsEvent.newBuilder()
		.setAtomId(PACKAGE_NOTIFICATION_CHANNEL_GROUP_PREFERENCES);
		event.writeInt(r.uid);
		event.addBooleanAnnotation(ANNOTATION_ID_IS_UID, true);
		event.writeString(groupChannel.getId());
		event.writeString(groupChannel.getName().toString());
		event.writeString(groupChannel.getDescription());

services/core/java/com/android/server/stats/pull/StatsPullAtomService.java

+23 −0

Original line number	Diff line number	Diff line
		@@ -29,6 +29,7 @@ import static android.os.storage.VolumeInfo.TYPE_PUBLIC;
		import static android.util.MathUtils.abs;
		import static android.util.MathUtils.constrain;

		import static com.android.internal.util.FrameworkStatsLog.ANNOTATION_ID_IS_UID;
		import static com.android.server.am.MemoryStatUtil.readMemoryStatFromFilesystem;
		import static com.android.server.stats.pull.IonMemoryUtil.readProcessSystemIonHeapSizesFromDebugfs;
		import static com.android.server.stats.pull.IonMemoryUtil.readSystemIonHeapSizeFromDebugfs;
		@@ -750,6 +751,7 @@ public class StatsPullAtomService extends SystemService {
		StatsEvent.Builder e = StatsEvent.newBuilder();
		e.setAtomId(atomTag);
		e.writeInt(entry.uid);
		e.addBooleanAnnotation(ANNOTATION_ID_IS_UID, true);
		if (withFgbg) {
		e.writeInt(entry.set);
		}
		@@ -920,6 +922,7 @@ public class StatsPullAtomService extends SystemService {
		StatsEvent e = StatsEvent.newBuilder()
		.setAtomId(atomTag)
		.writeInt(traffic.getUid())
		.addBooleanAnnotation(ANNOTATION_ID_IS_UID, true)
		.writeLong(traffic.getRxBytes())
		.writeLong(traffic.getTxBytes())
		.build();
		@@ -1006,6 +1009,7 @@ public class StatsPullAtomService extends SystemService {
		StatsEvent e = StatsEvent.newBuilder()
		.setAtomId(atomTag)
		.writeInt(uid)
		.addBooleanAnnotation(ANNOTATION_ID_IS_UID, true)
		.writeLong(userTimeUs)
		.writeLong(systemTimeUs)
		.build();
		@@ -1036,6 +1040,7 @@ public class StatsPullAtomService extends SystemService {
		StatsEvent e = StatsEvent.newBuilder()
		.setAtomId(atomTag)
		.writeInt(uid)
		.addBooleanAnnotation(ANNOTATION_ID_IS_UID, true)
		.writeInt(freqIndex)
		.writeLong(cpuFreqTimeMs[freqIndex])
		.build();
		@@ -1066,6 +1071,7 @@ public class StatsPullAtomService extends SystemService {
		StatsEvent e = StatsEvent.newBuilder()
		.setAtomId(atomTag)
		.writeInt(uid)
		.addBooleanAnnotation(ANNOTATION_ID_IS_UID, true)
		.writeLong(cpuActiveTimesMs)
		.build();
		pulledData.add(e);
		@@ -1094,6 +1100,7 @@ public class StatsPullAtomService extends SystemService {
		StatsEvent e = StatsEvent.newBuilder()
		.setAtomId(atomTag)
		.writeInt(uid)
		.addBooleanAnnotation(ANNOTATION_ID_IS_UID, true)
		.writeInt(i)
		.writeLong(cpuClusterTimesMs[i])
		.build();
		@@ -1289,6 +1296,7 @@ public class StatsPullAtomService extends SystemService {
		StatsEvent e = StatsEvent.newBuilder()
		.setAtomId(atomTag)
		.writeInt(processMemoryState.uid)
		.addBooleanAnnotation(ANNOTATION_ID_IS_UID, true)
		.writeString(processMemoryState.processName)
		.writeInt(processMemoryState.oomScore)
		.writeLong(memoryStat.pgfault)
		@@ -1331,6 +1339,7 @@ public class StatsPullAtomService extends SystemService {
		StatsEvent e = StatsEvent.newBuilder()
		.setAtomId(atomTag)
		.writeInt(managedProcess.uid)
		.addBooleanAnnotation(ANNOTATION_ID_IS_UID, true)
		.writeString(managedProcess.processName)
		// RSS high-water mark in bytes.
		.writeLong(snapshot.rssHighWaterMarkInKilobytes * 1024L)
		@@ -1350,6 +1359,7 @@ public class StatsPullAtomService extends SystemService {
		StatsEvent e = StatsEvent.newBuilder()
		.setAtomId(atomTag)
		.writeInt(snapshot.uid)
		.addBooleanAnnotation(ANNOTATION_ID_IS_UID, true)
		.writeString(processCmdlines.valueAt(i))
		// RSS high-water mark in bytes.
		.writeLong(snapshot.rssHighWaterMarkInKilobytes * 1024L)
		@@ -1384,6 +1394,7 @@ public class StatsPullAtomService extends SystemService {
		StatsEvent e = StatsEvent.newBuilder()
		.setAtomId(atomTag)
		.writeInt(managedProcess.uid)
		.addBooleanAnnotation(ANNOTATION_ID_IS_UID, true)
		.writeString(managedProcess.processName)
		.writeInt(managedProcess.pid)
		.writeInt(managedProcess.oomScore)
		@@ -1409,6 +1420,7 @@ public class StatsPullAtomService extends SystemService {
		StatsEvent e = StatsEvent.newBuilder()
		.setAtomId(atomTag)
		.writeInt(snapshot.uid)
		.addBooleanAnnotation(ANNOTATION_ID_IS_UID, true)
		.writeString(processCmdlines.valueAt(i))
		.writeInt(pid)
		.writeInt(-1001) // Placeholder for native processes, OOM_SCORE_ADJ_MIN - 1.
		@@ -1481,6 +1493,7 @@ public class StatsPullAtomService extends SystemService {
		StatsEvent e = StatsEvent.newBuilder()
		.setAtomId(atomTag)
		.writeInt(getUidForPid(allocations.pid))
		.addBooleanAnnotation(ANNOTATION_ID_IS_UID, true)
		.writeString(readCmdlineFromProcfs(allocations.pid))
		.writeInt((int) (allocations.totalSizeInBytes / 1024))
		.writeInt(allocations.count)
		@@ -1593,6 +1606,7 @@ public class StatsPullAtomService extends SystemService {
		StatsEvent e = StatsEvent.newBuilder()
		.setAtomId(atomTag)
		.writeInt(callStat.workSourceUid)
		.addBooleanAnnotation(ANNOTATION_ID_IS_UID, true)
		.writeString(callStat.className)
		.writeString(callStat.methodName)
		.writeLong(callStat.callCount)
		@@ -1669,6 +1683,7 @@ public class StatsPullAtomService extends SystemService {
		StatsEvent e = StatsEvent.newBuilder()
		.setAtomId(atomTag)
		.writeInt(entry.workSourceUid)
		.addBooleanAnnotation(ANNOTATION_ID_IS_UID, true)
		.writeString(entry.handlerClassName)
		.writeString(entry.threadName)
		.writeString(entry.messageName)
		@@ -2112,6 +2127,7 @@ public class StatsPullAtomService extends SystemService {
		StatsEvent e = StatsEvent.newBuilder()
		.setAtomId(atomTag)
		.writeInt(uid)
		.addBooleanAnnotation(ANNOTATION_ID_IS_UID, true)
		.writeLong(fgCharsRead)
		.writeLong(fgCharsWrite)
		.writeLong(fgBytesRead)
		@@ -2177,6 +2193,7 @@ public class StatsPullAtomService extends SystemService {
		StatsEvent e = StatsEvent.newBuilder()
		.setAtomId(atomTag)
		.writeInt(st.uid)
		.addBooleanAnnotation(ANNOTATION_ID_IS_UID, true)
		.writeString(st.name)
		.writeLong(st.base_utime)
		.writeLong(st.base_stime)
		@@ -2235,6 +2252,7 @@ public class StatsPullAtomService extends SystemService {
		StatsEvent.Builder e = StatsEvent.newBuilder();
		e.setAtomId(atomTag);
		e.writeInt(processCpuUsage.uid);
		e.addBooleanAnnotation(ANNOTATION_ID_IS_UID, true);
		e.writeInt(processCpuUsage.processId);
		e.writeInt(threadCpuUsage.threadId);
		e.writeString(processCpuUsage.processName);
		@@ -2326,6 +2344,7 @@ public class StatsPullAtomService extends SystemService {
		StatsEvent e = StatsEvent.newBuilder()
		.setAtomId(atomTag)
		.writeInt(bs.uidObj.getUid())
		.addBooleanAnnotation(ANNOTATION_ID_IS_UID, true)
		.writeLong(milliAmpHrsToNanoAmpSecs(bs.totalPowerMah))
		.build();
		pulledData.add(e);
		@@ -2530,6 +2549,7 @@ public class StatsPullAtomService extends SystemService {
		StatsEvent e = StatsEvent.newBuilder()
		.setAtomId(atomTag)
		.writeInt(pkg.applicationInfo.uid)
		.addBooleanAnnotation(ANNOTATION_ID_IS_UID, true)
		.writeString(holderName)
		.writeString(roleName)
		.build();
		@@ -2613,6 +2633,7 @@ public class StatsPullAtomService extends SystemService {
		e.setAtomId(atomTag);
		e.writeString(permName);
		e.writeInt(pkg.applicationInfo.uid);
		e.addBooleanAnnotation(ANNOTATION_ID_IS_UID, true);
		if (atomTag == FrameworkStatsLog.DANGEROUS_PERMISSION_STATE) {
		e.writeString("");
		}
		@@ -2967,6 +2988,7 @@ public class StatsPullAtomService extends SystemService {
		StatsEvent.Builder e = StatsEvent.newBuilder();
		e.setAtomId(atomTag);
		e.writeInt(uid);
		e.addBooleanAnnotation(ANNOTATION_ID_IS_UID, true);
		e.writeString(packageName);
		if (atomTag == FrameworkStatsLog.ATTRIBUTED_APP_OPS) {
		e.writeString(attributionTag);
		@@ -3015,6 +3037,7 @@ public class StatsPullAtomService extends SystemService {
		StatsEvent.Builder e = StatsEvent.newBuilder();
		e.setAtomId(atomTag);
		e.writeInt(message.getUid());
		e.addBooleanAnnotation(ANNOTATION_ID_IS_UID, true);
		e.writeString(message.getPackageName());
		e.writeString(message.getOp());
		if (message.getAttributionTag() == null) {