Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2b30f322 authored Feb 20, 2018 by Yi Jin

Rename dumpsys protos to make platform proto names consistent.

All the other dumpsys use XXXServiceDumpProto or XXXDumpProto other
than ones modified here.

The name convention is if the proto describes the top level output of dumpsys,
it should contain `Dump`. This makes the consumer easy to understand the proto
is from dumpsys of a certain service, not data structure of
the service, e.g. WindowManagerServiceProto ->
WindowManagerServiceDumpProto.

Another change here is ActivityManagerService has 4 sub dump protos, so
the top level for each one should be a DumpProto instead of its internal
data struture, e.g. ActivityStackSupervisorProto will just be a field of
AmServiceDumpActivitiesProto, which `dumpsys --proto activities` used to
output ActivityStackSupervisorProto directly.

Bug: 72474563
Test: manual and CTS tests
Change-Id: I1e1ac032d27591083bb5b1b19aac82804215472a

parent b1d5004c

core/java/android/app/ActivityThread.java

+78 −67

Original line number	Original line	Diff line number	Diff line
	@@ -143,7 +143,7 @@ import com.android.internal.util.ArrayUtils;
	import com.android.internal.util.FastPrintWriter;		import com.android.internal.util.FastPrintWriter;
	import com.android.org.conscrypt.OpenSSLSocketImpl;		import com.android.org.conscrypt.OpenSSLSocketImpl;
	import com.android.org.conscrypt.TrustedCertificateStore;		import com.android.org.conscrypt.TrustedCertificateStore;
	import com.android.server.am.proto.MemInfoProto;		import com.android.server.am.proto.MemInfoDumpProto;

	import dalvik.system.BaseDexClassLoader;		import dalvik.system.BaseDexClassLoader;
	import dalvik.system.CloseGuard;		import dalvik.system.CloseGuard;
	@@ -1251,55 +1251,62 @@ public final class ActivityThread extends ClientTransactionHandler {
	long parcelCount = Parcel.getGlobalAllocCount();		long parcelCount = Parcel.getGlobalAllocCount();
	SQLiteDebug.PagerStats stats = SQLiteDebug.getDatabaseInfo();		SQLiteDebug.PagerStats stats = SQLiteDebug.getDatabaseInfo();

	final long mToken = proto.start(MemInfoProto.AppData.PROCESS_MEMORY);		final long mToken = proto.start(MemInfoDumpProto.AppData.PROCESS_MEMORY);
	proto.write(MemInfoProto.ProcessMemory.PID, Process.myPid());		proto.write(MemInfoDumpProto.ProcessMemory.PID, Process.myPid());
	proto.write(MemInfoProto.ProcessMemory.PROCESS_NAME,		proto.write(MemInfoDumpProto.ProcessMemory.PROCESS_NAME,
	(mBoundApplication != null) ? mBoundApplication.processName : "unknown");		(mBoundApplication != null) ? mBoundApplication.processName : "unknown");
	dumpMemInfoTable(proto, memInfo, dumpDalvik, dumpSummaryOnly,		dumpMemInfoTable(proto, memInfo, dumpDalvik, dumpSummaryOnly,
	nativeMax, nativeAllocated, nativeFree,		nativeMax, nativeAllocated, nativeFree,
	dalvikMax, dalvikAllocated, dalvikFree);		dalvikMax, dalvikAllocated, dalvikFree);
	proto.end(mToken);		proto.end(mToken);

	final long oToken = proto.start(MemInfoProto.AppData.OBJECTS);		final long oToken = proto.start(MemInfoDumpProto.AppData.OBJECTS);
	proto.write(MemInfoProto.AppData.ObjectStats.VIEW_INSTANCE_COUNT, viewInstanceCount);		proto.write(MemInfoDumpProto.AppData.ObjectStats.VIEW_INSTANCE_COUNT,
	proto.write(MemInfoProto.AppData.ObjectStats.VIEW_ROOT_INSTANCE_COUNT,		viewInstanceCount);
			proto.write(MemInfoDumpProto.AppData.ObjectStats.VIEW_ROOT_INSTANCE_COUNT,
	viewRootInstanceCount);		viewRootInstanceCount);
	proto.write(MemInfoProto.AppData.ObjectStats.APP_CONTEXT_INSTANCE_COUNT,		proto.write(MemInfoDumpProto.AppData.ObjectStats.APP_CONTEXT_INSTANCE_COUNT,
	appContextInstanceCount);		appContextInstanceCount);
	proto.write(MemInfoProto.AppData.ObjectStats.ACTIVITY_INSTANCE_COUNT,		proto.write(MemInfoDumpProto.AppData.ObjectStats.ACTIVITY_INSTANCE_COUNT,
	activityInstanceCount);		activityInstanceCount);
	proto.write(MemInfoProto.AppData.ObjectStats.GLOBAL_ASSET_COUNT, globalAssetCount);		proto.write(MemInfoDumpProto.AppData.ObjectStats.GLOBAL_ASSET_COUNT,
	proto.write(MemInfoProto.AppData.ObjectStats.GLOBAL_ASSET_MANAGER_COUNT,		globalAssetCount);
			proto.write(MemInfoDumpProto.AppData.ObjectStats.GLOBAL_ASSET_MANAGER_COUNT,
	globalAssetManagerCount);		globalAssetManagerCount);
	proto.write(MemInfoProto.AppData.ObjectStats.LOCAL_BINDER_OBJECT_COUNT,		proto.write(MemInfoDumpProto.AppData.ObjectStats.LOCAL_BINDER_OBJECT_COUNT,
	binderLocalObjectCount);		binderLocalObjectCount);
	proto.write(MemInfoProto.AppData.ObjectStats.PROXY_BINDER_OBJECT_COUNT,		proto.write(MemInfoDumpProto.AppData.ObjectStats.PROXY_BINDER_OBJECT_COUNT,
	binderProxyObjectCount);		binderProxyObjectCount);
	proto.write(MemInfoProto.AppData.ObjectStats.PARCEL_MEMORY_KB, parcelSize / 1024);		proto.write(MemInfoDumpProto.AppData.ObjectStats.PARCEL_MEMORY_KB,
	proto.write(MemInfoProto.AppData.ObjectStats.PARCEL_COUNT, parcelCount);		parcelSize / 1024);
	proto.write(MemInfoProto.AppData.ObjectStats.BINDER_OBJECT_DEATH_COUNT,		proto.write(MemInfoDumpProto.AppData.ObjectStats.PARCEL_COUNT, parcelCount);
			proto.write(MemInfoDumpProto.AppData.ObjectStats.BINDER_OBJECT_DEATH_COUNT,
	binderDeathObjectCount);		binderDeathObjectCount);
	proto.write(MemInfoProto.AppData.ObjectStats.OPEN_SSL_SOCKET_COUNT, openSslSocketCount);		proto.write(MemInfoDumpProto.AppData.ObjectStats.OPEN_SSL_SOCKET_COUNT,
	proto.write(MemInfoProto.AppData.ObjectStats.WEBVIEW_INSTANCE_COUNT,		openSslSocketCount);
			proto.write(MemInfoDumpProto.AppData.ObjectStats.WEBVIEW_INSTANCE_COUNT,
	webviewInstanceCount);		webviewInstanceCount);
	proto.end(oToken);		proto.end(oToken);

	// SQLite mem info		// SQLite mem info
	final long sToken = proto.start(MemInfoProto.AppData.SQL);		final long sToken = proto.start(MemInfoDumpProto.AppData.SQL);
	proto.write(MemInfoProto.AppData.SqlStats.MEMORY_USED_KB, stats.memoryUsed / 1024);		proto.write(MemInfoDumpProto.AppData.SqlStats.MEMORY_USED_KB,
	proto.write(MemInfoProto.AppData.SqlStats.PAGECACHE_OVERFLOW_KB,		stats.memoryUsed / 1024);
			proto.write(MemInfoDumpProto.AppData.SqlStats.PAGECACHE_OVERFLOW_KB,
	stats.pageCacheOverflow / 1024);		stats.pageCacheOverflow / 1024);
	proto.write(MemInfoProto.AppData.SqlStats.MALLOC_SIZE_KB, stats.largestMemAlloc / 1024);		proto.write(MemInfoDumpProto.AppData.SqlStats.MALLOC_SIZE_KB,
			stats.largestMemAlloc / 1024);
	int n = stats.dbStats.size();		int n = stats.dbStats.size();
	for (int i = 0; i < n; i++) {		for (int i = 0; i < n; i++) {
	DbStats dbStats = stats.dbStats.get(i);		DbStats dbStats = stats.dbStats.get(i);

	final long dToken = proto.start(MemInfoProto.AppData.SqlStats.DATABASES);		final long dToken = proto.start(MemInfoDumpProto.AppData.SqlStats.DATABASES);
	proto.write(MemInfoProto.AppData.SqlStats.Database.NAME, dbStats.dbName);		proto.write(MemInfoDumpProto.AppData.SqlStats.Database.NAME, dbStats.dbName);
	proto.write(MemInfoProto.AppData.SqlStats.Database.PAGE_SIZE, dbStats.pageSize);		proto.write(MemInfoDumpProto.AppData.SqlStats.Database.PAGE_SIZE, dbStats.pageSize);
	proto.write(MemInfoProto.AppData.SqlStats.Database.DB_SIZE, dbStats.dbSize);		proto.write(MemInfoDumpProto.AppData.SqlStats.Database.DB_SIZE, dbStats.dbSize);
	proto.write(MemInfoProto.AppData.SqlStats.Database.LOOKASIDE_B, dbStats.lookaside);		proto.write(MemInfoDumpProto.AppData.SqlStats.Database.LOOKASIDE_B,
	proto.write(MemInfoProto.AppData.SqlStats.Database.CACHE, dbStats.cache);		dbStats.lookaside);
			proto.write(MemInfoDumpProto.AppData.SqlStats.Database.CACHE, dbStats.cache);
	proto.end(dToken);		proto.end(dToken);
	}		}
	proto.end(sToken);		proto.end(sToken);
	@@ -1307,7 +1314,7 @@ public final class ActivityThread extends ClientTransactionHandler {
	// Asset details.		// Asset details.
	String assetAlloc = AssetManager.getAssetAllocations();		String assetAlloc = AssetManager.getAssetAllocations();
	if (assetAlloc != null) {		if (assetAlloc != null) {
	proto.write(MemInfoProto.AppData.ASSET_ALLOCATIONS, assetAlloc);		proto.write(MemInfoDumpProto.AppData.ASSET_ALLOCATIONS, assetAlloc);
	}		}

	// Unreachable native memory		// Unreachable native memory
	@@ -1315,7 +1322,7 @@ public final class ActivityThread extends ClientTransactionHandler {
	int flags = mBoundApplication == null ? 0 : mBoundApplication.appInfo.flags;		int flags = mBoundApplication == null ? 0 : mBoundApplication.appInfo.flags;
	boolean showContents = (flags & ApplicationInfo.FLAG_DEBUGGABLE) != 0		boolean showContents = (flags & ApplicationInfo.FLAG_DEBUGGABLE) != 0
	\|\| android.os.Build.IS_DEBUGGABLE;		\|\| android.os.Build.IS_DEBUGGABLE;
	proto.write(MemInfoProto.AppData.UNREACHABLE_MEMORY,		proto.write(MemInfoDumpProto.AppData.UNREACHABLE_MEMORY,
	Debug.getUnreachableMemory(100, showContents));		Debug.getUnreachableMemory(100, showContents));
	}		}
	}		}
	@@ -2505,17 +2512,17 @@ public final class ActivityThread extends ClientTransactionHandler {
	boolean hasSwappedOutPss, int dirtySwap, int dirtySwapPss) {		boolean hasSwappedOutPss, int dirtySwap, int dirtySwapPss) {
	final long token = proto.start(fieldId);		final long token = proto.start(fieldId);

	proto.write(MemInfoProto.ProcessMemory.MemoryInfo.NAME, name);		proto.write(MemInfoDumpProto.ProcessMemory.MemoryInfo.NAME, name);
	proto.write(MemInfoProto.ProcessMemory.MemoryInfo.TOTAL_PSS_KB, pss);		proto.write(MemInfoDumpProto.ProcessMemory.MemoryInfo.TOTAL_PSS_KB, pss);
	proto.write(MemInfoProto.ProcessMemory.MemoryInfo.CLEAN_PSS_KB, cleanPss);		proto.write(MemInfoDumpProto.ProcessMemory.MemoryInfo.CLEAN_PSS_KB, cleanPss);
	proto.write(MemInfoProto.ProcessMemory.MemoryInfo.SHARED_DIRTY_KB, sharedDirty);		proto.write(MemInfoDumpProto.ProcessMemory.MemoryInfo.SHARED_DIRTY_KB, sharedDirty);
	proto.write(MemInfoProto.ProcessMemory.MemoryInfo.PRIVATE_DIRTY_KB, privateDirty);		proto.write(MemInfoDumpProto.ProcessMemory.MemoryInfo.PRIVATE_DIRTY_KB, privateDirty);
	proto.write(MemInfoProto.ProcessMemory.MemoryInfo.SHARED_CLEAN_KB, sharedClean);		proto.write(MemInfoDumpProto.ProcessMemory.MemoryInfo.SHARED_CLEAN_KB, sharedClean);
	proto.write(MemInfoProto.ProcessMemory.MemoryInfo.PRIVATE_CLEAN_KB, privateClean);		proto.write(MemInfoDumpProto.ProcessMemory.MemoryInfo.PRIVATE_CLEAN_KB, privateClean);
	if (hasSwappedOutPss) {		if (hasSwappedOutPss) {
	proto.write(MemInfoProto.ProcessMemory.MemoryInfo.DIRTY_SWAP_PSS_KB, dirtySwapPss);		proto.write(MemInfoDumpProto.ProcessMemory.MemoryInfo.DIRTY_SWAP_PSS_KB, dirtySwapPss);
	} else {		} else {
	proto.write(MemInfoProto.ProcessMemory.MemoryInfo.DIRTY_SWAP_KB, dirtySwap);		proto.write(MemInfoDumpProto.ProcessMemory.MemoryInfo.DIRTY_SWAP_KB, dirtySwap);
	}		}

	proto.end(token);		proto.end(token);
	@@ -2530,26 +2537,26 @@ public final class ActivityThread extends ClientTransactionHandler {
	long dalvikMax, long dalvikAllocated, long dalvikFree) {		long dalvikMax, long dalvikAllocated, long dalvikFree) {

	if (!dumpSummaryOnly) {		if (!dumpSummaryOnly) {
	final long nhToken = proto.start(MemInfoProto.ProcessMemory.NATIVE_HEAP);		final long nhToken = proto.start(MemInfoDumpProto.ProcessMemory.NATIVE_HEAP);
	dumpMemoryInfo(proto, MemInfoProto.ProcessMemory.HeapInfo.MEM_INFO, "Native Heap",		dumpMemoryInfo(proto, MemInfoDumpProto.ProcessMemory.HeapInfo.MEM_INFO, "Native Heap",
	memInfo.nativePss, memInfo.nativeSwappablePss, memInfo.nativeSharedDirty,		memInfo.nativePss, memInfo.nativeSwappablePss, memInfo.nativeSharedDirty,
	memInfo.nativePrivateDirty, memInfo.nativeSharedClean,		memInfo.nativePrivateDirty, memInfo.nativeSharedClean,
	memInfo.nativePrivateClean, memInfo.hasSwappedOutPss,		memInfo.nativePrivateClean, memInfo.hasSwappedOutPss,
	memInfo.nativeSwappedOut, memInfo.nativeSwappedOutPss);		memInfo.nativeSwappedOut, memInfo.nativeSwappedOutPss);
	proto.write(MemInfoProto.ProcessMemory.HeapInfo.HEAP_SIZE_KB, nativeMax);		proto.write(MemInfoDumpProto.ProcessMemory.HeapInfo.HEAP_SIZE_KB, nativeMax);
	proto.write(MemInfoProto.ProcessMemory.HeapInfo.HEAP_ALLOC_KB, nativeAllocated);		proto.write(MemInfoDumpProto.ProcessMemory.HeapInfo.HEAP_ALLOC_KB, nativeAllocated);
	proto.write(MemInfoProto.ProcessMemory.HeapInfo.HEAP_FREE_KB, nativeFree);		proto.write(MemInfoDumpProto.ProcessMemory.HeapInfo.HEAP_FREE_KB, nativeFree);
	proto.end(nhToken);		proto.end(nhToken);

	final long dvToken = proto.start(MemInfoProto.ProcessMemory.DALVIK_HEAP);		final long dvToken = proto.start(MemInfoDumpProto.ProcessMemory.DALVIK_HEAP);
	dumpMemoryInfo(proto, MemInfoProto.ProcessMemory.HeapInfo.MEM_INFO, "Dalvik Heap",		dumpMemoryInfo(proto, MemInfoDumpProto.ProcessMemory.HeapInfo.MEM_INFO, "Dalvik Heap",
	memInfo.dalvikPss, memInfo.dalvikSwappablePss, memInfo.dalvikSharedDirty,		memInfo.dalvikPss, memInfo.dalvikSwappablePss, memInfo.dalvikSharedDirty,
	memInfo.dalvikPrivateDirty, memInfo.dalvikSharedClean,		memInfo.dalvikPrivateDirty, memInfo.dalvikSharedClean,
	memInfo.dalvikPrivateClean, memInfo.hasSwappedOutPss,		memInfo.dalvikPrivateClean, memInfo.hasSwappedOutPss,
	memInfo.dalvikSwappedOut, memInfo.dalvikSwappedOutPss);		memInfo.dalvikSwappedOut, memInfo.dalvikSwappedOutPss);
	proto.write(MemInfoProto.ProcessMemory.HeapInfo.HEAP_SIZE_KB, dalvikMax);		proto.write(MemInfoDumpProto.ProcessMemory.HeapInfo.HEAP_SIZE_KB, dalvikMax);
	proto.write(MemInfoProto.ProcessMemory.HeapInfo.HEAP_ALLOC_KB, dalvikAllocated);		proto.write(MemInfoDumpProto.ProcessMemory.HeapInfo.HEAP_ALLOC_KB, dalvikAllocated);
	proto.write(MemInfoProto.ProcessMemory.HeapInfo.HEAP_FREE_KB, dalvikFree);		proto.write(MemInfoDumpProto.ProcessMemory.HeapInfo.HEAP_FREE_KB, dalvikFree);
	proto.end(dvToken);		proto.end(dvToken);

	int otherPss = memInfo.otherPss;		int otherPss = memInfo.otherPss;
	@@ -2573,7 +2580,7 @@ public final class ActivityThread extends ClientTransactionHandler {
	if (myPss != 0 \|\| mySharedDirty != 0 \|\| myPrivateDirty != 0		if (myPss != 0 \|\| mySharedDirty != 0 \|\| myPrivateDirty != 0
	\|\| mySharedClean != 0 \|\| myPrivateClean != 0		\|\| mySharedClean != 0 \|\| myPrivateClean != 0
	\|\| (memInfo.hasSwappedOutPss ? mySwappedOutPss : mySwappedOut) != 0) {		\|\| (memInfo.hasSwappedOutPss ? mySwappedOutPss : mySwappedOut) != 0) {
	dumpMemoryInfo(proto, MemInfoProto.ProcessMemory.OTHER_HEAPS,		dumpMemoryInfo(proto, MemInfoDumpProto.ProcessMemory.OTHER_HEAPS,
	Debug.MemoryInfo.getOtherLabel(i),		Debug.MemoryInfo.getOtherLabel(i),
	myPss, mySwappablePss, mySharedDirty, myPrivateDirty,		myPss, mySwappablePss, mySharedDirty, myPrivateDirty,
	mySharedClean, myPrivateClean,		mySharedClean, myPrivateClean,
	@@ -2590,21 +2597,23 @@ public final class ActivityThread extends ClientTransactionHandler {
	}		}
	}		}

	dumpMemoryInfo(proto, MemInfoProto.ProcessMemory.UNKNOWN_HEAP, "Unknown",		dumpMemoryInfo(proto, MemInfoDumpProto.ProcessMemory.UNKNOWN_HEAP, "Unknown",
	otherPss, otherSwappablePss,		otherPss, otherSwappablePss,
	otherSharedDirty, otherPrivateDirty, otherSharedClean, otherPrivateClean,		otherSharedDirty, otherPrivateDirty, otherSharedClean, otherPrivateClean,
	memInfo.hasSwappedOutPss, otherSwappedOut, otherSwappedOutPss);		memInfo.hasSwappedOutPss, otherSwappedOut, otherSwappedOutPss);
	final long tToken = proto.start(MemInfoProto.ProcessMemory.TOTAL_HEAP);		final long tToken = proto.start(MemInfoDumpProto.ProcessMemory.TOTAL_HEAP);
	dumpMemoryInfo(proto, MemInfoProto.ProcessMemory.HeapInfo.MEM_INFO, "TOTAL",		dumpMemoryInfo(proto, MemInfoDumpProto.ProcessMemory.HeapInfo.MEM_INFO, "TOTAL",
	memInfo.getTotalPss(), memInfo.getTotalSwappablePss(),		memInfo.getTotalPss(), memInfo.getTotalSwappablePss(),
	memInfo.getTotalSharedDirty(), memInfo.getTotalPrivateDirty(),		memInfo.getTotalSharedDirty(), memInfo.getTotalPrivateDirty(),
	memInfo.getTotalSharedClean(), memInfo.getTotalPrivateClean(),		memInfo.getTotalSharedClean(), memInfo.getTotalPrivateClean(),
	memInfo.hasSwappedOutPss, memInfo.getTotalSwappedOut(),		memInfo.hasSwappedOutPss, memInfo.getTotalSwappedOut(),
	memInfo.getTotalSwappedOutPss());		memInfo.getTotalSwappedOutPss());
	proto.write(MemInfoProto.ProcessMemory.HeapInfo.HEAP_SIZE_KB, nativeMax + dalvikMax);		proto.write(MemInfoDumpProto.ProcessMemory.HeapInfo.HEAP_SIZE_KB,
	proto.write(MemInfoProto.ProcessMemory.HeapInfo.HEAP_ALLOC_KB,		nativeMax + dalvikMax);
			proto.write(MemInfoDumpProto.ProcessMemory.HeapInfo.HEAP_ALLOC_KB,
	nativeAllocated + dalvikAllocated);		nativeAllocated + dalvikAllocated);
	proto.write(MemInfoProto.ProcessMemory.HeapInfo.HEAP_FREE_KB, nativeFree + dalvikFree);		proto.write(MemInfoDumpProto.ProcessMemory.HeapInfo.HEAP_FREE_KB,
			nativeFree + dalvikFree);
	proto.end(tToken);		proto.end(tToken);

	if (dumpDalvik) {		if (dumpDalvik) {
	@@ -2622,7 +2631,7 @@ public final class ActivityThread extends ClientTransactionHandler {
	if (myPss != 0 \|\| mySharedDirty != 0 \|\| myPrivateDirty != 0		if (myPss != 0 \|\| mySharedDirty != 0 \|\| myPrivateDirty != 0
	\|\| mySharedClean != 0 \|\| myPrivateClean != 0		\|\| mySharedClean != 0 \|\| myPrivateClean != 0
	\|\| (memInfo.hasSwappedOutPss ? mySwappedOutPss : mySwappedOut) != 0) {		\|\| (memInfo.hasSwappedOutPss ? mySwappedOutPss : mySwappedOut) != 0) {
	dumpMemoryInfo(proto, MemInfoProto.ProcessMemory.DALVIK_DETAILS,		dumpMemoryInfo(proto, MemInfoDumpProto.ProcessMemory.DALVIK_DETAILS,
	Debug.MemoryInfo.getOtherLabel(i),		Debug.MemoryInfo.getOtherLabel(i),
	myPss, mySwappablePss, mySharedDirty, myPrivateDirty,		myPss, mySwappablePss, mySharedDirty, myPrivateDirty,
	mySharedClean, myPrivateClean,		mySharedClean, myPrivateClean,
	@@ -2632,24 +2641,26 @@ public final class ActivityThread extends ClientTransactionHandler {
	}		}
	}		}

	final long asToken = proto.start(MemInfoProto.ProcessMemory.APP_SUMMARY);		final long asToken = proto.start(MemInfoDumpProto.ProcessMemory.APP_SUMMARY);
	proto.write(MemInfoProto.ProcessMemory.AppSummary.JAVA_HEAP_PSS_KB,		proto.write(MemInfoDumpProto.ProcessMemory.AppSummary.JAVA_HEAP_PSS_KB,
	memInfo.getSummaryJavaHeap());		memInfo.getSummaryJavaHeap());
	proto.write(MemInfoProto.ProcessMemory.AppSummary.NATIVE_HEAP_PSS_KB,		proto.write(MemInfoDumpProto.ProcessMemory.AppSummary.NATIVE_HEAP_PSS_KB,
	memInfo.getSummaryNativeHeap());		memInfo.getSummaryNativeHeap());
	proto.write(MemInfoProto.ProcessMemory.AppSummary.CODE_PSS_KB, memInfo.getSummaryCode());		proto.write(MemInfoDumpProto.ProcessMemory.AppSummary.CODE_PSS_KB,
	proto.write(MemInfoProto.ProcessMemory.AppSummary.STACK_PSS_KB, memInfo.getSummaryStack());		memInfo.getSummaryCode());
	proto.write(MemInfoProto.ProcessMemory.AppSummary.GRAPHICS_PSS_KB,		proto.write(MemInfoDumpProto.ProcessMemory.AppSummary.STACK_PSS_KB,
			memInfo.getSummaryStack());
			proto.write(MemInfoDumpProto.ProcessMemory.AppSummary.GRAPHICS_PSS_KB,
	memInfo.getSummaryGraphics());		memInfo.getSummaryGraphics());
	proto.write(MemInfoProto.ProcessMemory.AppSummary.PRIVATE_OTHER_PSS_KB,		proto.write(MemInfoDumpProto.ProcessMemory.AppSummary.PRIVATE_OTHER_PSS_KB,
	memInfo.getSummaryPrivateOther());		memInfo.getSummaryPrivateOther());
	proto.write(MemInfoProto.ProcessMemory.AppSummary.SYSTEM_PSS_KB,		proto.write(MemInfoDumpProto.ProcessMemory.AppSummary.SYSTEM_PSS_KB,
	memInfo.getSummarySystem());		memInfo.getSummarySystem());
	if (memInfo.hasSwappedOutPss) {		if (memInfo.hasSwappedOutPss) {
	proto.write(MemInfoProto.ProcessMemory.AppSummary.TOTAL_SWAP_PSS,		proto.write(MemInfoDumpProto.ProcessMemory.AppSummary.TOTAL_SWAP_PSS,
	memInfo.getSummaryTotalSwapPss());		memInfo.getSummaryTotalSwapPss());
	} else {		} else {
	proto.write(MemInfoProto.ProcessMemory.AppSummary.TOTAL_SWAP_PSS,		proto.write(MemInfoDumpProto.ProcessMemory.AppSummary.TOTAL_SWAP_PSS,
	memInfo.getSummaryTotalSwap());		memInfo.getSummaryTotalSwap());
	}		}
	proto.end(asToken);		proto.end(asToken);

core/proto/android/os/incident.proto

+7 −7

Original line number	Original line	Diff line number	Diff line
	@@ -214,37 +214,37 @@ message IncidentProto {
	(section).args = "procstats --proto"		(section).args = "procstats --proto"
	];		];

	optional com.android.server.am.proto.ActivityStackSupervisorProto activities = 3012 [		optional com.android.server.am.proto.ActivityManagerServiceDumpActivitiesProto activities = 3012 [
	(section).type = SECTION_DUMPSYS,		(section).type = SECTION_DUMPSYS,
	(section).args = "activity --proto activities"		(section).args = "activity --proto activities"
	];		];

	optional com.android.server.am.proto.BroadcastProto broadcasts = 3013 [		optional com.android.server.am.proto.ActivityManagerServiceDumpBroadcastsProto broadcasts = 3013 [
	(section).type = SECTION_DUMPSYS,		(section).type = SECTION_DUMPSYS,
	(section).args = "activity --proto broadcasts"		(section).args = "activity --proto broadcasts"
	];		];

	optional com.android.server.am.proto.ActiveServicesProto amservices = 3014 [		optional com.android.server.am.proto.ActivityManagerServiceDumpServicesProto amservices = 3014 [
	(section).type = SECTION_DUMPSYS,		(section).type = SECTION_DUMPSYS,
	(section).args = "activity --proto service"		(section).args = "activity --proto service"
	];		];

	optional com.android.server.am.proto.ProcessesProto amprocesses = 3015 [		optional com.android.server.am.proto.ActivityManagerServiceDumpProcessesProto amprocesses = 3015 [
	(section).type = SECTION_DUMPSYS,		(section).type = SECTION_DUMPSYS,
	(section).args = "activity --proto processes"		(section).args = "activity --proto processes"
	];		];

	optional com.android.server.AlarmManagerServiceProto alarm = 3016 [		optional com.android.server.AlarmManagerServiceDumpProto alarm = 3016 [
	(section).type = SECTION_DUMPSYS,		(section).type = SECTION_DUMPSYS,
	(section).args = "alarm --proto"		(section).args = "alarm --proto"
	];		];

	optional com.android.server.wm.proto.WindowManagerServiceProto window = 3017 [		optional com.android.server.wm.proto.WindowManagerServiceDumpProto window = 3017 [
	(section).type = SECTION_DUMPSYS,		(section).type = SECTION_DUMPSYS,
	(section).args = "window --proto"		(section).args = "window --proto"
	];		];

	optional com.android.server.am.proto.MemInfoProto meminfo = 3018 [		optional com.android.server.am.proto.MemInfoDumpProto meminfo = 3018 [
	(section).type = SECTION_DUMPSYS,		(section).type = SECTION_DUMPSYS,
	(section).args = "meminfo -a --proto"		(section).args = "meminfo -a --proto"
	];		];

core/proto/android/server/activitymanagerservice.proto

+19 −7

Original line number	Original line	Diff line number	Diff line
	@@ -40,16 +40,22 @@ option java_multiple_files = true;
	message ActivityManagerServiceProto {		message ActivityManagerServiceProto {
	option (.android.msg_privacy).dest = DEST_AUTOMATIC;		option (.android.msg_privacy).dest = DEST_AUTOMATIC;

	optional ActivityStackSupervisorProto activities = 1;		optional ActivityManagerServiceDumpActivitiesProto activities = 1;

	optional BroadcastProto broadcasts = 2;		optional ActivityManagerServiceDumpBroadcastsProto broadcasts = 2;

	optional ActiveServicesProto services = 3;		optional ActivityManagerServiceDumpServicesProto services = 3;

	optional ProcessesProto processes = 4;		optional ActivityManagerServiceDumpProcessesProto processes = 4;
	}		}

	// "dumpsys activity --proto activities"		// "dumpsys activity --proto activities"
			message ActivityManagerServiceDumpActivitiesProto {
			option (.android.msg_privacy).dest = DEST_AUTOMATIC;

			optional ActivityStackSupervisorProto activity_stack_supervisor = 1;
			}

	message ActivityStackSupervisorProto {		message ActivityStackSupervisorProto {
	option (.android.msg_privacy).dest = DEST_AUTOMATIC;		option (.android.msg_privacy).dest = DEST_AUTOMATIC;

	@@ -121,7 +127,7 @@ message KeyguardControllerProto {
	}		}

	// "dumpsys activity --proto broadcasts"		// "dumpsys activity --proto broadcasts"
	message BroadcastProto {		message ActivityManagerServiceDumpBroadcastsProto {
	option (.android.msg_privacy).dest = DEST_AUTOMATIC;		option (.android.msg_privacy).dest = DEST_AUTOMATIC;

	repeated ReceiverListProto receiver_list = 1;		repeated ReceiverListProto receiver_list = 1;
	@@ -202,7 +208,7 @@ message BroadcastQueueProto {
	repeated BroadcastSummary historical_broadcasts_summary = 6;		repeated BroadcastSummary historical_broadcasts_summary = 6;
	}		}

	message MemInfoProto {		message MemInfoDumpProto {
	option (.android.msg_privacy).dest = DEST_AUTOMATIC;		option (.android.msg_privacy).dest = DEST_AUTOMATIC;

	optional int64 uptime_duration_ms = 1;		optional int64 uptime_duration_ms = 1;
	@@ -406,6 +412,12 @@ message StickyBroadcastProto {
	}		}

	// "dumpsys activity --proto service"		// "dumpsys activity --proto service"
			message ActivityManagerServiceDumpServicesProto {
			option (.android.msg_privacy).dest = DEST_AUTOMATIC;

			optional ActiveServicesProto active_services = 1;
			}

	message ActiveServicesProto {		message ActiveServicesProto {
	option (.android.msg_privacy).dest = DEST_AUTOMATIC;		option (.android.msg_privacy).dest = DEST_AUTOMATIC;

	@@ -585,7 +597,7 @@ message IntentBindRecordProto {
	}		}

	// TODO: "dumpsys activity --proto processes"		// TODO: "dumpsys activity --proto processes"
	message ProcessesProto {		message ActivityManagerServiceDumpProcessesProto {
	option (.android.msg_privacy).dest = DEST_AUTOMATIC;		option (.android.msg_privacy).dest = DEST_AUTOMATIC;

	repeated ProcessRecordProto procs = 1;		repeated ProcessRecordProto procs = 1;

core/proto/android/server/alarmmanagerservice.proto

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -28,7 +28,7 @@ package com.android.server;
	option java_multiple_files = true;		option java_multiple_files = true;

	// next ID: 43		// next ID: 43
	message AlarmManagerServiceProto {		message AlarmManagerServiceDumpProto {
	option (.android.msg_privacy).dest = DEST_AUTOMATIC;		option (.android.msg_privacy).dest = DEST_AUTOMATIC;

	optional int64 current_time = 1;		optional int64 current_time = 1;

core/proto/android/server/windowmanagerservice.proto

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -32,7 +32,7 @@ package com.android.server.wm.proto;

	option java_multiple_files = true;		option java_multiple_files = true;

	message WindowManagerServiceProto {		message WindowManagerServiceDumpProto {
	option (.android.msg_privacy).dest = DEST_AUTOMATIC;		option (.android.msg_privacy).dest = DEST_AUTOMATIC;

	optional WindowManagerPolicyProto policy = 1;		optional WindowManagerPolicyProto policy = 1;