diff options
| author | 2018-03-01 00:54:51 +0000 | |
|---|---|---|
| committer | 2018-03-01 00:54:51 +0000 | |
| commit | ef71a4cc6ec290c09d8b33694e6ef78a8bfe56a7 (patch) | |
| tree | addf5dfadafd053a259dd5d2000f7fc2b56bbca1 | |
| parent | efbdc6b04a53b3e6168e561a867b28fb5511be0c (diff) | |
| parent | 2b30f322128722d7e5bec8a6a737f3762a6ae98a (diff) | |
Merge "Rename dumpsys protos to make platform proto names consistent."
12 files changed, 332 insertions, 301 deletions
diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java index 457f945bff80..379944e2e230 100644 --- a/core/java/android/app/ActivityThread.java +++ b/core/java/android/app/ActivityThread.java @@ -143,7 +143,7 @@ import com.android.internal.util.ArrayUtils; import com.android.internal.util.FastPrintWriter; import com.android.org.conscrypt.OpenSSLSocketImpl; 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.CloseGuard; @@ -1251,55 +1251,62 @@ public final class ActivityThread extends ClientTransactionHandler { long parcelCount = Parcel.getGlobalAllocCount(); SQLiteDebug.PagerStats stats = SQLiteDebug.getDatabaseInfo(); - final long mToken = proto.start(MemInfoProto.AppData.PROCESS_MEMORY); - proto.write(MemInfoProto.ProcessMemory.PID, Process.myPid()); - proto.write(MemInfoProto.ProcessMemory.PROCESS_NAME, + final long mToken = proto.start(MemInfoDumpProto.AppData.PROCESS_MEMORY); + proto.write(MemInfoDumpProto.ProcessMemory.PID, Process.myPid()); + proto.write(MemInfoDumpProto.ProcessMemory.PROCESS_NAME, (mBoundApplication != null) ? mBoundApplication.processName : "unknown"); dumpMemInfoTable(proto, memInfo, dumpDalvik, dumpSummaryOnly, nativeMax, nativeAllocated, nativeFree, dalvikMax, dalvikAllocated, dalvikFree); proto.end(mToken); - final long oToken = proto.start(MemInfoProto.AppData.OBJECTS); - proto.write(MemInfoProto.AppData.ObjectStats.VIEW_INSTANCE_COUNT, viewInstanceCount); - proto.write(MemInfoProto.AppData.ObjectStats.VIEW_ROOT_INSTANCE_COUNT, + final long oToken = proto.start(MemInfoDumpProto.AppData.OBJECTS); + proto.write(MemInfoDumpProto.AppData.ObjectStats.VIEW_INSTANCE_COUNT, + viewInstanceCount); + proto.write(MemInfoDumpProto.AppData.ObjectStats.VIEW_ROOT_INSTANCE_COUNT, viewRootInstanceCount); - proto.write(MemInfoProto.AppData.ObjectStats.APP_CONTEXT_INSTANCE_COUNT, + proto.write(MemInfoDumpProto.AppData.ObjectStats.APP_CONTEXT_INSTANCE_COUNT, appContextInstanceCount); - proto.write(MemInfoProto.AppData.ObjectStats.ACTIVITY_INSTANCE_COUNT, + proto.write(MemInfoDumpProto.AppData.ObjectStats.ACTIVITY_INSTANCE_COUNT, activityInstanceCount); - proto.write(MemInfoProto.AppData.ObjectStats.GLOBAL_ASSET_COUNT, globalAssetCount); - proto.write(MemInfoProto.AppData.ObjectStats.GLOBAL_ASSET_MANAGER_COUNT, + proto.write(MemInfoDumpProto.AppData.ObjectStats.GLOBAL_ASSET_COUNT, + globalAssetCount); + proto.write(MemInfoDumpProto.AppData.ObjectStats.GLOBAL_ASSET_MANAGER_COUNT, globalAssetManagerCount); - proto.write(MemInfoProto.AppData.ObjectStats.LOCAL_BINDER_OBJECT_COUNT, + proto.write(MemInfoDumpProto.AppData.ObjectStats.LOCAL_BINDER_OBJECT_COUNT, binderLocalObjectCount); - proto.write(MemInfoProto.AppData.ObjectStats.PROXY_BINDER_OBJECT_COUNT, + proto.write(MemInfoDumpProto.AppData.ObjectStats.PROXY_BINDER_OBJECT_COUNT, binderProxyObjectCount); - proto.write(MemInfoProto.AppData.ObjectStats.PARCEL_MEMORY_KB, parcelSize / 1024); - proto.write(MemInfoProto.AppData.ObjectStats.PARCEL_COUNT, parcelCount); - proto.write(MemInfoProto.AppData.ObjectStats.BINDER_OBJECT_DEATH_COUNT, + proto.write(MemInfoDumpProto.AppData.ObjectStats.PARCEL_MEMORY_KB, + parcelSize / 1024); + proto.write(MemInfoDumpProto.AppData.ObjectStats.PARCEL_COUNT, parcelCount); + proto.write(MemInfoDumpProto.AppData.ObjectStats.BINDER_OBJECT_DEATH_COUNT, binderDeathObjectCount); - proto.write(MemInfoProto.AppData.ObjectStats.OPEN_SSL_SOCKET_COUNT, openSslSocketCount); - proto.write(MemInfoProto.AppData.ObjectStats.WEBVIEW_INSTANCE_COUNT, + proto.write(MemInfoDumpProto.AppData.ObjectStats.OPEN_SSL_SOCKET_COUNT, + openSslSocketCount); + proto.write(MemInfoDumpProto.AppData.ObjectStats.WEBVIEW_INSTANCE_COUNT, webviewInstanceCount); proto.end(oToken); // SQLite mem info - final long sToken = proto.start(MemInfoProto.AppData.SQL); - proto.write(MemInfoProto.AppData.SqlStats.MEMORY_USED_KB, stats.memoryUsed / 1024); - proto.write(MemInfoProto.AppData.SqlStats.PAGECACHE_OVERFLOW_KB, + final long sToken = proto.start(MemInfoDumpProto.AppData.SQL); + proto.write(MemInfoDumpProto.AppData.SqlStats.MEMORY_USED_KB, + stats.memoryUsed / 1024); + proto.write(MemInfoDumpProto.AppData.SqlStats.PAGECACHE_OVERFLOW_KB, 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(); for (int i = 0; i < n; i++) { DbStats dbStats = stats.dbStats.get(i); - final long dToken = proto.start(MemInfoProto.AppData.SqlStats.DATABASES); - proto.write(MemInfoProto.AppData.SqlStats.Database.NAME, dbStats.dbName); - proto.write(MemInfoProto.AppData.SqlStats.Database.PAGE_SIZE, dbStats.pageSize); - proto.write(MemInfoProto.AppData.SqlStats.Database.DB_SIZE, dbStats.dbSize); - proto.write(MemInfoProto.AppData.SqlStats.Database.LOOKASIDE_B, dbStats.lookaside); - proto.write(MemInfoProto.AppData.SqlStats.Database.CACHE, dbStats.cache); + final long dToken = proto.start(MemInfoDumpProto.AppData.SqlStats.DATABASES); + proto.write(MemInfoDumpProto.AppData.SqlStats.Database.NAME, dbStats.dbName); + proto.write(MemInfoDumpProto.AppData.SqlStats.Database.PAGE_SIZE, dbStats.pageSize); + proto.write(MemInfoDumpProto.AppData.SqlStats.Database.DB_SIZE, dbStats.dbSize); + proto.write(MemInfoDumpProto.AppData.SqlStats.Database.LOOKASIDE_B, + dbStats.lookaside); + proto.write(MemInfoDumpProto.AppData.SqlStats.Database.CACHE, dbStats.cache); proto.end(dToken); } proto.end(sToken); @@ -1307,7 +1314,7 @@ public final class ActivityThread extends ClientTransactionHandler { // Asset details. String assetAlloc = AssetManager.getAssetAllocations(); if (assetAlloc != null) { - proto.write(MemInfoProto.AppData.ASSET_ALLOCATIONS, assetAlloc); + proto.write(MemInfoDumpProto.AppData.ASSET_ALLOCATIONS, assetAlloc); } // Unreachable native memory @@ -1315,7 +1322,7 @@ public final class ActivityThread extends ClientTransactionHandler { int flags = mBoundApplication == null ? 0 : mBoundApplication.appInfo.flags; boolean showContents = (flags & ApplicationInfo.FLAG_DEBUGGABLE) != 0 || android.os.Build.IS_DEBUGGABLE; - proto.write(MemInfoProto.AppData.UNREACHABLE_MEMORY, + proto.write(MemInfoDumpProto.AppData.UNREACHABLE_MEMORY, Debug.getUnreachableMemory(100, showContents)); } } @@ -2505,17 +2512,17 @@ public final class ActivityThread extends ClientTransactionHandler { boolean hasSwappedOutPss, int dirtySwap, int dirtySwapPss) { final long token = proto.start(fieldId); - proto.write(MemInfoProto.ProcessMemory.MemoryInfo.NAME, name); - proto.write(MemInfoProto.ProcessMemory.MemoryInfo.TOTAL_PSS_KB, pss); - proto.write(MemInfoProto.ProcessMemory.MemoryInfo.CLEAN_PSS_KB, cleanPss); - proto.write(MemInfoProto.ProcessMemory.MemoryInfo.SHARED_DIRTY_KB, sharedDirty); - proto.write(MemInfoProto.ProcessMemory.MemoryInfo.PRIVATE_DIRTY_KB, privateDirty); - proto.write(MemInfoProto.ProcessMemory.MemoryInfo.SHARED_CLEAN_KB, sharedClean); - proto.write(MemInfoProto.ProcessMemory.MemoryInfo.PRIVATE_CLEAN_KB, privateClean); + proto.write(MemInfoDumpProto.ProcessMemory.MemoryInfo.NAME, name); + proto.write(MemInfoDumpProto.ProcessMemory.MemoryInfo.TOTAL_PSS_KB, pss); + proto.write(MemInfoDumpProto.ProcessMemory.MemoryInfo.CLEAN_PSS_KB, cleanPss); + proto.write(MemInfoDumpProto.ProcessMemory.MemoryInfo.SHARED_DIRTY_KB, sharedDirty); + proto.write(MemInfoDumpProto.ProcessMemory.MemoryInfo.PRIVATE_DIRTY_KB, privateDirty); + proto.write(MemInfoDumpProto.ProcessMemory.MemoryInfo.SHARED_CLEAN_KB, sharedClean); + proto.write(MemInfoDumpProto.ProcessMemory.MemoryInfo.PRIVATE_CLEAN_KB, privateClean); if (hasSwappedOutPss) { - proto.write(MemInfoProto.ProcessMemory.MemoryInfo.DIRTY_SWAP_PSS_KB, dirtySwapPss); + proto.write(MemInfoDumpProto.ProcessMemory.MemoryInfo.DIRTY_SWAP_PSS_KB, dirtySwapPss); } else { - proto.write(MemInfoProto.ProcessMemory.MemoryInfo.DIRTY_SWAP_KB, dirtySwap); + proto.write(MemInfoDumpProto.ProcessMemory.MemoryInfo.DIRTY_SWAP_KB, dirtySwap); } proto.end(token); @@ -2530,26 +2537,26 @@ public final class ActivityThread extends ClientTransactionHandler { long dalvikMax, long dalvikAllocated, long dalvikFree) { if (!dumpSummaryOnly) { - final long nhToken = proto.start(MemInfoProto.ProcessMemory.NATIVE_HEAP); - dumpMemoryInfo(proto, MemInfoProto.ProcessMemory.HeapInfo.MEM_INFO, "Native Heap", + final long nhToken = proto.start(MemInfoDumpProto.ProcessMemory.NATIVE_HEAP); + dumpMemoryInfo(proto, MemInfoDumpProto.ProcessMemory.HeapInfo.MEM_INFO, "Native Heap", memInfo.nativePss, memInfo.nativeSwappablePss, memInfo.nativeSharedDirty, memInfo.nativePrivateDirty, memInfo.nativeSharedClean, memInfo.nativePrivateClean, memInfo.hasSwappedOutPss, memInfo.nativeSwappedOut, memInfo.nativeSwappedOutPss); - proto.write(MemInfoProto.ProcessMemory.HeapInfo.HEAP_SIZE_KB, nativeMax); - proto.write(MemInfoProto.ProcessMemory.HeapInfo.HEAP_ALLOC_KB, nativeAllocated); - proto.write(MemInfoProto.ProcessMemory.HeapInfo.HEAP_FREE_KB, nativeFree); + proto.write(MemInfoDumpProto.ProcessMemory.HeapInfo.HEAP_SIZE_KB, nativeMax); + proto.write(MemInfoDumpProto.ProcessMemory.HeapInfo.HEAP_ALLOC_KB, nativeAllocated); + proto.write(MemInfoDumpProto.ProcessMemory.HeapInfo.HEAP_FREE_KB, nativeFree); proto.end(nhToken); - final long dvToken = proto.start(MemInfoProto.ProcessMemory.DALVIK_HEAP); - dumpMemoryInfo(proto, MemInfoProto.ProcessMemory.HeapInfo.MEM_INFO, "Dalvik Heap", + final long dvToken = proto.start(MemInfoDumpProto.ProcessMemory.DALVIK_HEAP); + dumpMemoryInfo(proto, MemInfoDumpProto.ProcessMemory.HeapInfo.MEM_INFO, "Dalvik Heap", memInfo.dalvikPss, memInfo.dalvikSwappablePss, memInfo.dalvikSharedDirty, memInfo.dalvikPrivateDirty, memInfo.dalvikSharedClean, memInfo.dalvikPrivateClean, memInfo.hasSwappedOutPss, memInfo.dalvikSwappedOut, memInfo.dalvikSwappedOutPss); - proto.write(MemInfoProto.ProcessMemory.HeapInfo.HEAP_SIZE_KB, dalvikMax); - proto.write(MemInfoProto.ProcessMemory.HeapInfo.HEAP_ALLOC_KB, dalvikAllocated); - proto.write(MemInfoProto.ProcessMemory.HeapInfo.HEAP_FREE_KB, dalvikFree); + proto.write(MemInfoDumpProto.ProcessMemory.HeapInfo.HEAP_SIZE_KB, dalvikMax); + proto.write(MemInfoDumpProto.ProcessMemory.HeapInfo.HEAP_ALLOC_KB, dalvikAllocated); + proto.write(MemInfoDumpProto.ProcessMemory.HeapInfo.HEAP_FREE_KB, dalvikFree); proto.end(dvToken); int otherPss = memInfo.otherPss; @@ -2573,7 +2580,7 @@ public final class ActivityThread extends ClientTransactionHandler { if (myPss != 0 || mySharedDirty != 0 || myPrivateDirty != 0 || mySharedClean != 0 || myPrivateClean != 0 || (memInfo.hasSwappedOutPss ? mySwappedOutPss : mySwappedOut) != 0) { - dumpMemoryInfo(proto, MemInfoProto.ProcessMemory.OTHER_HEAPS, + dumpMemoryInfo(proto, MemInfoDumpProto.ProcessMemory.OTHER_HEAPS, Debug.MemoryInfo.getOtherLabel(i), myPss, mySwappablePss, mySharedDirty, myPrivateDirty, 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, otherSharedDirty, otherPrivateDirty, otherSharedClean, otherPrivateClean, memInfo.hasSwappedOutPss, otherSwappedOut, otherSwappedOutPss); - final long tToken = proto.start(MemInfoProto.ProcessMemory.TOTAL_HEAP); - dumpMemoryInfo(proto, MemInfoProto.ProcessMemory.HeapInfo.MEM_INFO, "TOTAL", + final long tToken = proto.start(MemInfoDumpProto.ProcessMemory.TOTAL_HEAP); + dumpMemoryInfo(proto, MemInfoDumpProto.ProcessMemory.HeapInfo.MEM_INFO, "TOTAL", memInfo.getTotalPss(), memInfo.getTotalSwappablePss(), memInfo.getTotalSharedDirty(), memInfo.getTotalPrivateDirty(), memInfo.getTotalSharedClean(), memInfo.getTotalPrivateClean(), memInfo.hasSwappedOutPss, memInfo.getTotalSwappedOut(), memInfo.getTotalSwappedOutPss()); - proto.write(MemInfoProto.ProcessMemory.HeapInfo.HEAP_SIZE_KB, nativeMax + dalvikMax); - proto.write(MemInfoProto.ProcessMemory.HeapInfo.HEAP_ALLOC_KB, + proto.write(MemInfoDumpProto.ProcessMemory.HeapInfo.HEAP_SIZE_KB, + nativeMax + dalvikMax); + proto.write(MemInfoDumpProto.ProcessMemory.HeapInfo.HEAP_ALLOC_KB, 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); if (dumpDalvik) { @@ -2622,7 +2631,7 @@ public final class ActivityThread extends ClientTransactionHandler { if (myPss != 0 || mySharedDirty != 0 || myPrivateDirty != 0 || mySharedClean != 0 || myPrivateClean != 0 || (memInfo.hasSwappedOutPss ? mySwappedOutPss : mySwappedOut) != 0) { - dumpMemoryInfo(proto, MemInfoProto.ProcessMemory.DALVIK_DETAILS, + dumpMemoryInfo(proto, MemInfoDumpProto.ProcessMemory.DALVIK_DETAILS, Debug.MemoryInfo.getOtherLabel(i), myPss, mySwappablePss, mySharedDirty, myPrivateDirty, mySharedClean, myPrivateClean, @@ -2632,24 +2641,26 @@ public final class ActivityThread extends ClientTransactionHandler { } } - final long asToken = proto.start(MemInfoProto.ProcessMemory.APP_SUMMARY); - proto.write(MemInfoProto.ProcessMemory.AppSummary.JAVA_HEAP_PSS_KB, + final long asToken = proto.start(MemInfoDumpProto.ProcessMemory.APP_SUMMARY); + proto.write(MemInfoDumpProto.ProcessMemory.AppSummary.JAVA_HEAP_PSS_KB, memInfo.getSummaryJavaHeap()); - proto.write(MemInfoProto.ProcessMemory.AppSummary.NATIVE_HEAP_PSS_KB, + proto.write(MemInfoDumpProto.ProcessMemory.AppSummary.NATIVE_HEAP_PSS_KB, memInfo.getSummaryNativeHeap()); - proto.write(MemInfoProto.ProcessMemory.AppSummary.CODE_PSS_KB, memInfo.getSummaryCode()); - proto.write(MemInfoProto.ProcessMemory.AppSummary.STACK_PSS_KB, memInfo.getSummaryStack()); - proto.write(MemInfoProto.ProcessMemory.AppSummary.GRAPHICS_PSS_KB, + proto.write(MemInfoDumpProto.ProcessMemory.AppSummary.CODE_PSS_KB, + memInfo.getSummaryCode()); + proto.write(MemInfoDumpProto.ProcessMemory.AppSummary.STACK_PSS_KB, + memInfo.getSummaryStack()); + proto.write(MemInfoDumpProto.ProcessMemory.AppSummary.GRAPHICS_PSS_KB, memInfo.getSummaryGraphics()); - proto.write(MemInfoProto.ProcessMemory.AppSummary.PRIVATE_OTHER_PSS_KB, + proto.write(MemInfoDumpProto.ProcessMemory.AppSummary.PRIVATE_OTHER_PSS_KB, memInfo.getSummaryPrivateOther()); - proto.write(MemInfoProto.ProcessMemory.AppSummary.SYSTEM_PSS_KB, + proto.write(MemInfoDumpProto.ProcessMemory.AppSummary.SYSTEM_PSS_KB, memInfo.getSummarySystem()); if (memInfo.hasSwappedOutPss) { - proto.write(MemInfoProto.ProcessMemory.AppSummary.TOTAL_SWAP_PSS, + proto.write(MemInfoDumpProto.ProcessMemory.AppSummary.TOTAL_SWAP_PSS, memInfo.getSummaryTotalSwapPss()); } else { - proto.write(MemInfoProto.ProcessMemory.AppSummary.TOTAL_SWAP_PSS, + proto.write(MemInfoDumpProto.ProcessMemory.AppSummary.TOTAL_SWAP_PSS, memInfo.getSummaryTotalSwap()); } proto.end(asToken); diff --git a/core/proto/android/os/incident.proto b/core/proto/android/os/incident.proto index be155977a1ea..7326829b584b 100644 --- a/core/proto/android/os/incident.proto +++ b/core/proto/android/os/incident.proto @@ -214,37 +214,37 @@ message IncidentProto { (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).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).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).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).args = "activity --proto processes" ]; - optional com.android.server.AlarmManagerServiceProto alarm = 3016 [ + optional com.android.server.AlarmManagerServiceDumpProto alarm = 3016 [ (section).type = SECTION_DUMPSYS, (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).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).args = "meminfo -a --proto" ]; diff --git a/core/proto/android/server/activitymanagerservice.proto b/core/proto/android/server/activitymanagerservice.proto index 5042ede77d2d..3b9150f44abc 100644 --- a/core/proto/android/server/activitymanagerservice.proto +++ b/core/proto/android/server/activitymanagerservice.proto @@ -40,16 +40,22 @@ option java_multiple_files = true; message ActivityManagerServiceProto { 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" +message ActivityManagerServiceDumpActivitiesProto { + option (.android.msg_privacy).dest = DEST_AUTOMATIC; + + optional ActivityStackSupervisorProto activity_stack_supervisor = 1; +} + message ActivityStackSupervisorProto { option (.android.msg_privacy).dest = DEST_AUTOMATIC; @@ -121,7 +127,7 @@ message KeyguardControllerProto { } // "dumpsys activity --proto broadcasts" -message BroadcastProto { +message ActivityManagerServiceDumpBroadcastsProto { option (.android.msg_privacy).dest = DEST_AUTOMATIC; repeated ReceiverListProto receiver_list = 1; @@ -202,7 +208,7 @@ message BroadcastQueueProto { repeated BroadcastSummary historical_broadcasts_summary = 6; } -message MemInfoProto { +message MemInfoDumpProto { option (.android.msg_privacy).dest = DEST_AUTOMATIC; optional int64 uptime_duration_ms = 1; @@ -406,6 +412,12 @@ message StickyBroadcastProto { } // "dumpsys activity --proto service" +message ActivityManagerServiceDumpServicesProto { + option (.android.msg_privacy).dest = DEST_AUTOMATIC; + + optional ActiveServicesProto active_services = 1; +} + message ActiveServicesProto { option (.android.msg_privacy).dest = DEST_AUTOMATIC; @@ -585,7 +597,7 @@ message IntentBindRecordProto { } // TODO: "dumpsys activity --proto processes" -message ProcessesProto { +message ActivityManagerServiceDumpProcessesProto { option (.android.msg_privacy).dest = DEST_AUTOMATIC; repeated ProcessRecordProto procs = 1; diff --git a/core/proto/android/server/alarmmanagerservice.proto b/core/proto/android/server/alarmmanagerservice.proto index b288c1149731..53e3ba965120 100644 --- a/core/proto/android/server/alarmmanagerservice.proto +++ b/core/proto/android/server/alarmmanagerservice.proto @@ -28,7 +28,7 @@ package com.android.server; option java_multiple_files = true; // next ID: 43 -message AlarmManagerServiceProto { +message AlarmManagerServiceDumpProto { option (.android.msg_privacy).dest = DEST_AUTOMATIC; optional int64 current_time = 1; diff --git a/core/proto/android/server/windowmanagerservice.proto b/core/proto/android/server/windowmanagerservice.proto index c11058a22107..7745ee45619e 100644 --- a/core/proto/android/server/windowmanagerservice.proto +++ b/core/proto/android/server/windowmanagerservice.proto @@ -32,7 +32,7 @@ package com.android.server.wm.proto; option java_multiple_files = true; -message WindowManagerServiceProto { +message WindowManagerServiceDumpProto { option (.android.msg_privacy).dest = DEST_AUTOMATIC; optional WindowManagerPolicyProto policy = 1; diff --git a/core/proto/android/server/windowmanagertrace.proto b/core/proto/android/server/windowmanagertrace.proto index d96953ee9ded..96a90bfe63da 100644 --- a/core/proto/android/server/windowmanagertrace.proto +++ b/core/proto/android/server/windowmanagertrace.proto @@ -48,5 +48,5 @@ message WindowManagerTraceProto { /* where the trace originated */ optional string where = 2; - optional WindowManagerServiceProto window_manager_service = 3; + optional WindowManagerServiceDumpProto window_manager_service = 3; } diff --git a/services/core/java/com/android/server/AlarmManagerService.java b/services/core/java/com/android/server/AlarmManagerService.java index 62a7b8feb19e..d17ca7f9e77a 100644 --- a/services/core/java/com/android/server/AlarmManagerService.java +++ b/services/core/java/com/android/server/AlarmManagerService.java @@ -2191,42 +2191,42 @@ class AlarmManagerService extends SystemService { synchronized (mLock) { final long nowRTC = System.currentTimeMillis(); final long nowElapsed = SystemClock.elapsedRealtime(); - proto.write(AlarmManagerServiceProto.CURRENT_TIME, nowRTC); - proto.write(AlarmManagerServiceProto.ELAPSED_REALTIME, nowElapsed); - proto.write(AlarmManagerServiceProto.LAST_TIME_CHANGE_CLOCK_TIME, + proto.write(AlarmManagerServiceDumpProto.CURRENT_TIME, nowRTC); + proto.write(AlarmManagerServiceDumpProto.ELAPSED_REALTIME, nowElapsed); + proto.write(AlarmManagerServiceDumpProto.LAST_TIME_CHANGE_CLOCK_TIME, mLastTimeChangeClockTime); - proto.write(AlarmManagerServiceProto.LAST_TIME_CHANGE_REALTIME, + proto.write(AlarmManagerServiceDumpProto.LAST_TIME_CHANGE_REALTIME, mLastTimeChangeRealtime); - mConstants.dumpProto(proto, AlarmManagerServiceProto.SETTINGS); + mConstants.dumpProto(proto, AlarmManagerServiceDumpProto.SETTINGS); if (mAppStateTracker != null) { mAppStateTracker.dumpProto(proto, - AlarmManagerServiceProto.FORCE_APP_STANDBY_TRACKER); + AlarmManagerServiceDumpProto.FORCE_APP_STANDBY_TRACKER); } - proto.write(AlarmManagerServiceProto.IS_INTERACTIVE, mInteractive); + proto.write(AlarmManagerServiceDumpProto.IS_INTERACTIVE, mInteractive); if (!mInteractive) { // Durations - proto.write(AlarmManagerServiceProto.TIME_SINCE_NON_INTERACTIVE_MS, + proto.write(AlarmManagerServiceDumpProto.TIME_SINCE_NON_INTERACTIVE_MS, nowElapsed - mNonInteractiveStartTime); - proto.write(AlarmManagerServiceProto.MAX_WAKEUP_DELAY_MS, + proto.write(AlarmManagerServiceDumpProto.MAX_WAKEUP_DELAY_MS, currentNonWakeupFuzzLocked(nowElapsed)); - proto.write(AlarmManagerServiceProto.TIME_SINCE_LAST_DISPATCH_MS, + proto.write(AlarmManagerServiceDumpProto.TIME_SINCE_LAST_DISPATCH_MS, nowElapsed - mLastAlarmDeliveryTime); - proto.write(AlarmManagerServiceProto.TIME_UNTIL_NEXT_NON_WAKEUP_DELIVERY_MS, + proto.write(AlarmManagerServiceDumpProto.TIME_UNTIL_NEXT_NON_WAKEUP_DELIVERY_MS, nowElapsed - mNextNonWakeupDeliveryTime); } - proto.write(AlarmManagerServiceProto.TIME_UNTIL_NEXT_NON_WAKEUP_ALARM_MS, + proto.write(AlarmManagerServiceDumpProto.TIME_UNTIL_NEXT_NON_WAKEUP_ALARM_MS, mNextNonWakeup - nowElapsed); - proto.write(AlarmManagerServiceProto.TIME_UNTIL_NEXT_WAKEUP_MS, + proto.write(AlarmManagerServiceDumpProto.TIME_UNTIL_NEXT_WAKEUP_MS, mNextWakeup - nowElapsed); - proto.write(AlarmManagerServiceProto.TIME_SINCE_LAST_WAKEUP_MS, + proto.write(AlarmManagerServiceDumpProto.TIME_SINCE_LAST_WAKEUP_MS, nowElapsed - mLastWakeup); - proto.write(AlarmManagerServiceProto.TIME_SINCE_LAST_WAKEUP_SET_MS, + proto.write(AlarmManagerServiceDumpProto.TIME_SINCE_LAST_WAKEUP_SET_MS, nowElapsed - mLastWakeupSet); - proto.write(AlarmManagerServiceProto.TIME_CHANGE_EVENT_COUNT, mNumTimeChanged); + proto.write(AlarmManagerServiceDumpProto.TIME_CHANGE_EVENT_COUNT, mNumTimeChanged); final TreeSet<Integer> users = new TreeSet<>(); final int nextAlarmClockForUserSize = mNextAlarmClockForUser.size(); @@ -2242,14 +2242,14 @@ class AlarmManagerService extends SystemService { final AlarmManager.AlarmClockInfo next = mNextAlarmClockForUser.get(user); final long time = next != null ? next.getTriggerTime() : 0; final boolean pendingSend = mPendingSendNextAlarmClockChangedForUser.get(user); - final long aToken = proto.start(AlarmManagerServiceProto.NEXT_ALARM_CLOCK_METADATA); + final long aToken = proto.start(AlarmManagerServiceDumpProto.NEXT_ALARM_CLOCK_METADATA); proto.write(AlarmClockMetadataProto.USER, user); proto.write(AlarmClockMetadataProto.IS_PENDING_SEND, pendingSend); proto.write(AlarmClockMetadataProto.TRIGGER_TIME_MS, time); proto.end(aToken); } for (Batch b : mAlarmBatches) { - b.writeToProto(proto, AlarmManagerServiceProto.PENDING_ALARM_BATCHES, + b.writeToProto(proto, AlarmManagerServiceDumpProto.PENDING_ALARM_BATCHES, nowElapsed, nowRTC); } for (int i = 0; i < mPendingBackgroundAlarms.size(); i++) { @@ -2257,66 +2257,66 @@ class AlarmManagerService extends SystemService { if (blockedAlarms != null) { for (Alarm a : blockedAlarms) { a.writeToProto(proto, - AlarmManagerServiceProto.PENDING_USER_BLOCKED_BACKGROUND_ALARMS, + AlarmManagerServiceDumpProto.PENDING_USER_BLOCKED_BACKGROUND_ALARMS, nowElapsed, nowRTC); } } } if (mPendingIdleUntil != null) { mPendingIdleUntil.writeToProto( - proto, AlarmManagerServiceProto.PENDING_IDLE_UNTIL, nowElapsed, nowRTC); + proto, AlarmManagerServiceDumpProto.PENDING_IDLE_UNTIL, nowElapsed, nowRTC); } for (Alarm a : mPendingWhileIdleAlarms) { - a.writeToProto(proto, AlarmManagerServiceProto.PENDING_WHILE_IDLE_ALARMS, + a.writeToProto(proto, AlarmManagerServiceDumpProto.PENDING_WHILE_IDLE_ALARMS, nowElapsed, nowRTC); } if (mNextWakeFromIdle != null) { - mNextWakeFromIdle.writeToProto(proto, AlarmManagerServiceProto.NEXT_WAKE_FROM_IDLE, + mNextWakeFromIdle.writeToProto(proto, AlarmManagerServiceDumpProto.NEXT_WAKE_FROM_IDLE, nowElapsed, nowRTC); } for (Alarm a : mPendingNonWakeupAlarms) { - a.writeToProto(proto, AlarmManagerServiceProto.PAST_DUE_NON_WAKEUP_ALARMS, + a.writeToProto(proto, AlarmManagerServiceDumpProto.PAST_DUE_NON_WAKEUP_ALARMS, nowElapsed, nowRTC); } - proto.write(AlarmManagerServiceProto.DELAYED_ALARM_COUNT, mNumDelayedAlarms); - proto.write(AlarmManagerServiceProto.TOTAL_DELAY_TIME_MS, mTotalDelayTime); - proto.write(AlarmManagerServiceProto.MAX_DELAY_DURATION_MS, mMaxDelayTime); - proto.write(AlarmManagerServiceProto.MAX_NON_INTERACTIVE_DURATION_MS, + proto.write(AlarmManagerServiceDumpProto.DELAYED_ALARM_COUNT, mNumDelayedAlarms); + proto.write(AlarmManagerServiceDumpProto.TOTAL_DELAY_TIME_MS, mTotalDelayTime); + proto.write(AlarmManagerServiceDumpProto.MAX_DELAY_DURATION_MS, mMaxDelayTime); + proto.write(AlarmManagerServiceDumpProto.MAX_NON_INTERACTIVE_DURATION_MS, mNonInteractiveTime); - proto.write(AlarmManagerServiceProto.BROADCAST_REF_COUNT, mBroadcastRefCount); - proto.write(AlarmManagerServiceProto.PENDING_INTENT_SEND_COUNT, mSendCount); - proto.write(AlarmManagerServiceProto.PENDING_INTENT_FINISH_COUNT, mSendFinishCount); - proto.write(AlarmManagerServiceProto.LISTENER_SEND_COUNT, mListenerCount); - proto.write(AlarmManagerServiceProto.LISTENER_FINISH_COUNT, mListenerFinishCount); + proto.write(AlarmManagerServiceDumpProto.BROADCAST_REF_COUNT, mBroadcastRefCount); + proto.write(AlarmManagerServiceDumpProto.PENDING_INTENT_SEND_COUNT, mSendCount); + proto.write(AlarmManagerServiceDumpProto.PENDING_INTENT_FINISH_COUNT, mSendFinishCount); + proto.write(AlarmManagerServiceDumpProto.LISTENER_SEND_COUNT, mListenerCount); + proto.write(AlarmManagerServiceDumpProto.LISTENER_FINISH_COUNT, mListenerFinishCount); for (InFlight f : mInFlight) { - f.writeToProto(proto, AlarmManagerServiceProto.OUTSTANDING_DELIVERIES); + f.writeToProto(proto, AlarmManagerServiceDumpProto.OUTSTANDING_DELIVERIES); } for (int i = 0; i < mLastAllowWhileIdleDispatch.size(); ++i) { final long token = proto.start( - AlarmManagerServiceProto.LAST_ALLOW_WHILE_IDLE_DISPATCH_TIMES); + AlarmManagerServiceDumpProto.LAST_ALLOW_WHILE_IDLE_DISPATCH_TIMES); final int uid = mLastAllowWhileIdleDispatch.keyAt(i); final long lastTime = mLastAllowWhileIdleDispatch.valueAt(i); - proto.write(AlarmManagerServiceProto.LastAllowWhileIdleDispatch.UID, uid); - proto.write(AlarmManagerServiceProto.LastAllowWhileIdleDispatch.TIME_MS, lastTime); - proto.write(AlarmManagerServiceProto.LastAllowWhileIdleDispatch.NEXT_ALLOWED_MS, + proto.write(AlarmManagerServiceDumpProto.LastAllowWhileIdleDispatch.UID, uid); + proto.write(AlarmManagerServiceDumpProto.LastAllowWhileIdleDispatch.TIME_MS, lastTime); + proto.write(AlarmManagerServiceDumpProto.LastAllowWhileIdleDispatch.NEXT_ALLOWED_MS, lastTime + getWhileIdleMinIntervalLocked(uid)); proto.end(token); } for (int i = 0; i < mUseAllowWhileIdleShortTime.size(); i++) { if (mUseAllowWhileIdleShortTime.valueAt(i)) { - proto.write(AlarmManagerServiceProto.USE_ALLOW_WHILE_IDLE_SHORT_TIME, + proto.write(AlarmManagerServiceDumpProto.USE_ALLOW_WHILE_IDLE_SHORT_TIME, mUseAllowWhileIdleShortTime.keyAt(i)); } } - mLog.writeToProto(proto, AlarmManagerServiceProto.RECENT_PROBLEMS); + mLog.writeToProto(proto, AlarmManagerServiceDumpProto.RECENT_PROBLEMS); final FilterStats[] topFilters = new FilterStats[10]; final Comparator<FilterStats> comparator = new Comparator<FilterStats>() { @@ -2357,13 +2357,13 @@ class AlarmManagerService extends SystemService { } } for (int i = 0; i < len; ++i) { - final long token = proto.start(AlarmManagerServiceProto.TOP_ALARMS); + final long token = proto.start(AlarmManagerServiceDumpProto.TOP_ALARMS); FilterStats fs = topFilters[i]; - proto.write(AlarmManagerServiceProto.TopAlarm.UID, fs.mBroadcastStats.mUid); - proto.write(AlarmManagerServiceProto.TopAlarm.PACKAGE_NAME, + proto.write(AlarmManagerServiceDumpProto.TopAlarm.UID, fs.mBroadcastStats.mUid); + proto.write(AlarmManagerServiceDumpProto.TopAlarm.PACKAGE_NAME, fs.mBroadcastStats.mPackageName); - fs.writeToProto(proto, AlarmManagerServiceProto.TopAlarm.FILTER); + fs.writeToProto(proto, AlarmManagerServiceDumpProto.TopAlarm.FILTER); proto.end(token); } @@ -2372,10 +2372,10 @@ class AlarmManagerService extends SystemService { for (int iu = 0; iu < mBroadcastStats.size(); ++iu) { ArrayMap<String, BroadcastStats> uidStats = mBroadcastStats.valueAt(iu); for (int ip = 0; ip < uidStats.size(); ++ip) { - final long token = proto.start(AlarmManagerServiceProto.ALARM_STATS); + final long token = proto.start(AlarmManagerServiceDumpProto.ALARM_STATS); BroadcastStats bs = uidStats.valueAt(ip); - bs.writeToProto(proto, AlarmManagerServiceProto.AlarmStat.BROADCAST); + bs.writeToProto(proto, AlarmManagerServiceDumpProto.AlarmStat.BROADCAST); // uidStats is an ArrayMap, which we can't sort. tmpFilters.clear(); @@ -2384,7 +2384,7 @@ class AlarmManagerService extends SystemService { } Collections.sort(tmpFilters, comparator); for (FilterStats fs : tmpFilters) { - fs.writeToProto(proto, AlarmManagerServiceProto.AlarmStat.FILTERS); + fs.writeToProto(proto, AlarmManagerServiceDumpProto.AlarmStat.FILTERS); } proto.end(token); @@ -2395,7 +2395,7 @@ class AlarmManagerService extends SystemService { for (int i = 0; i < mAllowWhileIdleDispatches.size(); i++) { IdleDispatchEntry ent = mAllowWhileIdleDispatches.get(i); final long token = proto.start( - AlarmManagerServiceProto.ALLOW_WHILE_IDLE_DISPATCHES); + AlarmManagerServiceDumpProto.ALLOW_WHILE_IDLE_DISPATCHES); proto.write(IdleDispatchEntryProto.UID, ent.uid); proto.write(IdleDispatchEntryProto.PKG, ent.pkg); @@ -2411,7 +2411,7 @@ class AlarmManagerService extends SystemService { if (WAKEUP_STATS) { for (WakeupEvent event : mRecentWakeups) { - final long token = proto.start(AlarmManagerServiceProto.RECENT_WAKEUP_HISTORY); + final long token = proto.start(AlarmManagerServiceDumpProto.RECENT_WAKEUP_HISTORY); proto.write(WakeupEventProto.UID, event.uid); proto.write(WakeupEventProto.ACTION, event.action); proto.write(WakeupEventProto.WHEN, event.when); diff --git a/services/core/java/com/android/server/am/ActiveServices.java b/services/core/java/com/android/server/am/ActiveServices.java index 5fc43732b404..0c6746e15988 100644 --- a/services/core/java/com/android/server/am/ActiveServices.java +++ b/services/core/java/com/android/server/am/ActiveServices.java @@ -3861,8 +3861,9 @@ public final class ActiveServices { return new ServiceDumper(fd, pw, args, opti, dumpAll, dumpPackage); } - protected void writeToProto(ProtoOutputStream proto) { + protected void writeToProto(ProtoOutputStream proto, long fieldId) { synchronized (mAm) { + final long outterToken = proto.start(fieldId); int[] users = mAm.mUserController.getUsers(); for (int user : users) { ServiceMap smap = mServiceMap.get(user); @@ -3878,6 +3879,7 @@ public final class ActiveServices { } proto.end(token); } + proto.end(outterToken); } } diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index ae665ef30ceb..28a79bdb79c8 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -440,15 +440,17 @@ import com.android.server.Watchdog; import com.android.server.am.ActivityStack.ActivityState; import com.android.server.am.MemoryStatUtil.MemoryStat; import com.android.server.am.proto.ActivityManagerServiceProto; -import com.android.server.am.proto.BroadcastProto; +import com.android.server.am.proto.ActivityManagerServiceDumpActivitiesProto; +import com.android.server.am.proto.ActivityManagerServiceDumpBroadcastsProto; +import com.android.server.am.proto.ActivityManagerServiceDumpProcessesProto; +import com.android.server.am.proto.ActivityManagerServiceDumpProcessesProto.UidObserverRegistrationProto; +import com.android.server.am.proto.ActivityManagerServiceDumpServicesProto; import com.android.server.am.proto.GrantUriProto; import com.android.server.am.proto.ImportanceTokenProto; -import com.android.server.am.proto.MemInfoProto; +import com.android.server.am.proto.MemInfoDumpProto; import com.android.server.am.proto.NeededUriGrantsProto; import com.android.server.am.proto.ProcessOomProto; import com.android.server.am.proto.ProcessToGcProto; -import com.android.server.am.proto.ProcessesProto; -import com.android.server.am.proto.ProcessesProto.UidObserverRegistrationProto; import com.android.server.am.proto.StickyBroadcastProto; import com.android.server.firewall.IntentFirewall; import com.android.server.job.JobSchedulerInternal; @@ -1376,9 +1378,9 @@ public class ActivityManagerService extends IActivityManager.Stub void writeToProto(ProtoOutputStream proto, long fieldId) { final long token = proto.start(fieldId); - proto.write(ProcessesProto.PendingTempWhitelist.TARGET_UID, targetUid); - proto.write(ProcessesProto.PendingTempWhitelist.DURATION_MS, duration); - proto.write(ProcessesProto.PendingTempWhitelist.TAG, tag); + proto.write(ActivityManagerServiceDumpProcessesProto.PendingTempWhitelist.TARGET_UID, targetUid); + proto.write(ActivityManagerServiceDumpProcessesProto.PendingTempWhitelist.DURATION_MS, duration); + proto.write(ActivityManagerServiceDumpProcessesProto.PendingTempWhitelist.TAG, tag); proto.end(token); } } @@ -15773,12 +15775,12 @@ public class ActivityManagerService extends IActivityManager.Stub opti++; if ("activities".equals(cmd) || "a".equals(cmd)) { - // output proto is ActivityStackSupervisorProto + // output proto is ActivityManagerServiceDumpActivitiesProto synchronized (this) { writeActivitiesToProtoLocked(proto); } } else if ("broadcasts".equals(cmd) || "b".equals(cmd)) { - // output proto is BroadcastProto + // output proto is ActivityManagerServiceDumpBroadcastsProto synchronized (this) { writeBroadcastsToProtoLocked(proto); } @@ -15800,7 +15802,8 @@ public class ActivityManagerService extends IActivityManager.Stub pw.println("Use -h for help."); } } else if ("service".equals(cmd)) { - mServices.writeToProto(proto); + // output proto is ActivityManagerServiceDumpServicesProto + mServices.writeToProto(proto, ActivityManagerServiceDumpServicesProto.ACTIVE_SERVICES); } else if ("processes".equals(cmd) || "p".equals(cmd)) { if (opti < args.length) { dumpPackage = args[opti]; @@ -15822,7 +15825,7 @@ public class ActivityManagerService extends IActivityManager.Stub proto.end(broadcastToken); long serviceToken = proto.start(ActivityManagerServiceProto.SERVICES); - mServices.writeToProto(proto); + mServices.writeToProto(proto, ActivityManagerServiceDumpServicesProto.ACTIVE_SERVICES); proto.end(serviceToken); long processToken = proto.start(ActivityManagerServiceProto.PROCESSES); @@ -16185,8 +16188,8 @@ public class ActivityManagerService extends IActivityManager.Stub } private void writeActivitiesToProtoLocked(ProtoOutputStream proto) { - // The output proto of "activity --proto activities" is ActivityStackSupervisorProto - mStackSupervisor.writeToProto(proto); + // The output proto of "activity --proto activities" is ActivityManagerServiceDumpActivitiesProto + mStackSupervisor.writeToProto(proto, ActivityManagerServiceDumpActivitiesProto.ACTIVITY_STACK_SUPERVISOR); } private void dumpLastANRLocked(PrintWriter pw) { @@ -16883,7 +16886,7 @@ public class ActivityManagerService extends IActivityManager.Stub if (dumpPackage != null && !r.pkgList.containsKey(dumpPackage)) { continue; } - r.writeToProto(proto, ProcessesProto.PROCS); + r.writeToProto(proto, ActivityManagerServiceDumpProcessesProto.PROCS); if (r.persistent) { numPers++; } @@ -16895,7 +16898,7 @@ public class ActivityManagerService extends IActivityManager.Stub if (dumpPackage != null && !r.pkgList.containsKey(dumpPackage)) { continue; } - r.writeToProto(proto, ProcessesProto.ISOLATED_PROCS); + r.writeToProto(proto, ActivityManagerServiceDumpProcessesProto.ISOLATED_PROCS); } for (int i=0; i<mActiveInstrumentation.size(); i++) { @@ -16904,7 +16907,7 @@ public class ActivityManagerService extends IActivityManager.Stub && !ai.mTargetInfo.packageName.equals(dumpPackage)) { continue; } - ai.writeToProto(proto, ProcessesProto.ACTIVE_INSTRUMENTATIONS); + ai.writeToProto(proto, ActivityManagerServiceDumpProcessesProto.ACTIVE_INSTRUMENTATIONS); } int whichAppId = getAppId(dumpPackage); @@ -16913,7 +16916,7 @@ public class ActivityManagerService extends IActivityManager.Stub if (dumpPackage != null && UserHandle.getAppId(uidRec.uid) != whichAppId) { continue; } - uidRec.writeToProto(proto, ProcessesProto.ACTIVE_UIDS); + uidRec.writeToProto(proto, ActivityManagerServiceDumpProcessesProto.ACTIVE_UIDS); } for (int i=0; i<mValidateUids.size(); i++) { @@ -16921,16 +16924,16 @@ public class ActivityManagerService extends IActivityManager.Stub if (dumpPackage != null && UserHandle.getAppId(uidRec.uid) != whichAppId) { continue; } - uidRec.writeToProto(proto, ProcessesProto.VALIDATE_UIDS); + uidRec.writeToProto(proto, ActivityManagerServiceDumpProcessesProto.VALIDATE_UIDS); } if (mLruProcesses.size() > 0) { - long lruToken = proto.start(ProcessesProto.LRU_PROCS); + long lruToken = proto.start(ActivityManagerServiceDumpProcessesProto.LRU_PROCS); int total = mLruProcesses.size(); - proto.write(ProcessesProto.LruProcesses.SIZE, total); - proto.write(ProcessesProto.LruProcesses.NON_ACT_AT, total-mLruProcessActivityStart); - proto.write(ProcessesProto.LruProcesses.NON_SVC_AT, total-mLruProcessServiceStart); - writeProcessOomListToProto(proto, ProcessesProto.LruProcesses.LIST, this, + proto.write(ActivityManagerServiceDumpProcessesProto.LruProcesses.SIZE, total); + proto.write(ActivityManagerServiceDumpProcessesProto.LruProcesses.NON_ACT_AT, total-mLruProcessActivityStart); + proto.write(ActivityManagerServiceDumpProcessesProto.LruProcesses.NON_SVC_AT, total-mLruProcessServiceStart); + writeProcessOomListToProto(proto, ActivityManagerServiceDumpProcessesProto.LruProcesses.LIST, this, mLruProcesses,false, dumpPackage); proto.end(lruToken); } @@ -16942,7 +16945,7 @@ public class ActivityManagerService extends IActivityManager.Stub if (!r.pkgList.containsKey(dumpPackage)) { continue; } - r.writeToProto(proto, ProcessesProto.PIDS_SELF_LOCKED); + r.writeToProto(proto, ActivityManagerServiceDumpProcessesProto.PIDS_SELF_LOCKED); } } } @@ -16956,7 +16959,7 @@ public class ActivityManagerService extends IActivityManager.Stub || !r.pkgList.containsKey(dumpPackage))) { continue; } - it.writeToProto(proto, ProcessesProto.IMPORTANT_PROCS); + it.writeToProto(proto, ActivityManagerServiceDumpProcessesProto.IMPORTANT_PROCS); } } } @@ -16966,7 +16969,7 @@ public class ActivityManagerService extends IActivityManager.Stub if (dumpPackage != null && !dumpPackage.equals(r.info.packageName)) { continue; } - r.writeToProto(proto, ProcessesProto.PERSISTENT_STARTING_PROCS); + r.writeToProto(proto, ActivityManagerServiceDumpProcessesProto.PERSISTENT_STARTING_PROCS); } for (int i=0; i<mRemovedProcesses.size(); i++) { @@ -16974,7 +16977,7 @@ public class ActivityManagerService extends IActivityManager.Stub if (dumpPackage != null && !dumpPackage.equals(r.info.packageName)) { continue; } - r.writeToProto(proto, ProcessesProto.REMOVED_PROCS); + r.writeToProto(proto, ActivityManagerServiceDumpProcessesProto.REMOVED_PROCS); } for (int i=0; i<mProcessesOnHold.size(); i++) { @@ -16982,41 +16985,41 @@ public class ActivityManagerService extends IActivityManager.Stub if (dumpPackage != null && !dumpPackage.equals(r.info.packageName)) { continue; } - r.writeToProto(proto, ProcessesProto.ON_HOLD_PROCS); + r.writeToProto(proto, ActivityManagerServiceDumpProcessesProto.ON_HOLD_PROCS); } - writeProcessesToGcToProto(proto, ProcessesProto.GC_PROCS, dumpPackage); - mAppErrors.writeToProto(proto, ProcessesProto.APP_ERRORS, dumpPackage); + writeProcessesToGcToProto(proto, ActivityManagerServiceDumpProcessesProto.GC_PROCS, dumpPackage); + mAppErrors.writeToProto(proto, ActivityManagerServiceDumpProcessesProto.APP_ERRORS, dumpPackage); if (dumpPackage == null) { - mUserController.writeToProto(proto, ProcessesProto.USER_CONTROLLER); - getGlobalConfiguration().writeToProto(proto, ProcessesProto.GLOBAL_CONFIGURATION); - proto.write(ProcessesProto.CONFIG_WILL_CHANGE, getFocusedStack().mConfigWillChange); + mUserController.writeToProto(proto, ActivityManagerServiceDumpProcessesProto.USER_CONTROLLER); + getGlobalConfiguration().writeToProto(proto, ActivityManagerServiceDumpProcessesProto.GLOBAL_CONFIGURATION); + proto.write(ActivityManagerServiceDumpProcessesProto.CONFIG_WILL_CHANGE, getFocusedStack().mConfigWillChange); } if (mHomeProcess != null && (dumpPackage == null || mHomeProcess.pkgList.containsKey(dumpPackage))) { - mHomeProcess.writeToProto(proto, ProcessesProto.HOME_PROC); + mHomeProcess.writeToProto(proto, ActivityManagerServiceDumpProcessesProto.HOME_PROC); } if (mPreviousProcess != null && (dumpPackage == null || mPreviousProcess.pkgList.containsKey(dumpPackage))) { - mPreviousProcess.writeToProto(proto, ProcessesProto.PREVIOUS_PROC); - proto.write(ProcessesProto.PREVIOUS_PROC_VISIBLE_TIME_MS, mPreviousProcessVisibleTime); + mPreviousProcess.writeToProto(proto, ActivityManagerServiceDumpProcessesProto.PREVIOUS_PROC); + proto.write(ActivityManagerServiceDumpProcessesProto.PREVIOUS_PROC_VISIBLE_TIME_MS, mPreviousProcessVisibleTime); } if (mHeavyWeightProcess != null && (dumpPackage == null || mHeavyWeightProcess.pkgList.containsKey(dumpPackage))) { - mHeavyWeightProcess.writeToProto(proto, ProcessesProto.HEAVY_WEIGHT_PROC); + mHeavyWeightProcess.writeToProto(proto, ActivityManagerServiceDumpProcessesProto.HEAVY_WEIGHT_PROC); } for (Map.Entry<String, Integer> entry : mCompatModePackages.getPackages().entrySet()) { String pkg = entry.getKey(); int mode = entry.getValue(); if (dumpPackage == null || dumpPackage.equals(pkg)) { - long compatToken = proto.start(ProcessesProto.SCREEN_COMPAT_PACKAGES); - proto.write(ProcessesProto.ScreenCompatPackage.PACKAGE, pkg); - proto.write(ProcessesProto.ScreenCompatPackage.MODE, mode); + long compatToken = proto.start(ActivityManagerServiceDumpProcessesProto.SCREEN_COMPAT_PACKAGES); + proto.write(ActivityManagerServiceDumpProcessesProto.ScreenCompatPackage.PACKAGE, pkg); + proto.write(ActivityManagerServiceDumpProcessesProto.ScreenCompatPackage.MODE, mode); proto.end(compatToken); } } @@ -17026,89 +17029,89 @@ public class ActivityManagerService extends IActivityManager.Stub final UidObserverRegistration reg = (UidObserverRegistration) mUidObservers.getRegisteredCallbackCookie(i); if (dumpPackage == null || dumpPackage.equals(reg.pkg)) { - reg.writeToProto(proto, ProcessesProto.UID_OBSERVERS); + reg.writeToProto(proto, ActivityManagerServiceDumpProcessesProto.UID_OBSERVERS); } } for (int v : mDeviceIdleWhitelist) { - proto.write(ProcessesProto.DEVICE_IDLE_WHITELIST, v); + proto.write(ActivityManagerServiceDumpProcessesProto.DEVICE_IDLE_WHITELIST, v); } for (int v : mDeviceIdleTempWhitelist) { - proto.write(ProcessesProto.DEVICE_IDLE_TEMP_WHITELIST, v); + proto.write(ActivityManagerServiceDumpProcessesProto.DEVICE_IDLE_TEMP_WHITELIST, v); } if (mPendingTempWhitelist.size() > 0) { for (int i=0; i < mPendingTempWhitelist.size(); i++) { mPendingTempWhitelist.valueAt(i).writeToProto(proto, - ProcessesProto.PENDING_TEMP_WHITELIST); + ActivityManagerServiceDumpProcessesProto.PENDING_TEMP_WHITELIST); } } if (dumpPackage == null) { - final long sleepToken = proto.start(ProcessesProto.SLEEP_STATUS); - proto.write(ProcessesProto.SleepStatus.WAKEFULNESS, + final long sleepToken = proto.start(ActivityManagerServiceDumpProcessesProto.SLEEP_STATUS); + proto.write(ActivityManagerServiceDumpProcessesProto.SleepStatus.WAKEFULNESS, PowerManagerInternal.wakefulnessToProtoEnum(mWakefulness)); for (SleepToken st : mStackSupervisor.mSleepTokens) { - proto.write(ProcessesProto.SleepStatus.SLEEP_TOKENS, st.toString()); + proto.write(ActivityManagerServiceDumpProcessesProto.SleepStatus.SLEEP_TOKENS, st.toString()); } - proto.write(ProcessesProto.SleepStatus.SLEEPING, mSleeping); - proto.write(ProcessesProto.SleepStatus.SHUTTING_DOWN, mShuttingDown); - proto.write(ProcessesProto.SleepStatus.TEST_PSS_MODE, mTestPssMode); + proto.write(ActivityManagerServiceDumpProcessesProto.SleepStatus.SLEEPING, mSleeping); + proto.write(ActivityManagerServiceDumpProcessesProto.SleepStatus.SHUTTING_DOWN, mShuttingDown); + proto.write(ActivityManagerServiceDumpProcessesProto.SleepStatus.TEST_PSS_MODE, mTestPssMode); proto.end(sleepToken); if (mRunningVoice != null) { - final long vrToken = proto.start(ProcessesProto.RUNNING_VOICE); - proto.write(ProcessesProto.VoiceProto.SESSION, mRunningVoice.toString()); - mVoiceWakeLock.writeToProto(proto, ProcessesProto.VoiceProto.WAKELOCK); + final long vrToken = proto.start(ActivityManagerServiceDumpProcessesProto.RUNNING_VOICE); + proto.write(ActivityManagerServiceDumpProcessesProto.VoiceProto.SESSION, mRunningVoice.toString()); + mVoiceWakeLock.writeToProto(proto, ActivityManagerServiceDumpProcessesProto.VoiceProto.WAKELOCK); proto.end(vrToken); } - mVrController.writeToProto(proto, ProcessesProto.VR_CONTROLLER); + mVrController.writeToProto(proto, ActivityManagerServiceDumpProcessesProto.VR_CONTROLLER); } if (mDebugApp != null || mOrigDebugApp != null || mDebugTransient || mOrigWaitForDebugger) { if (dumpPackage == null || dumpPackage.equals(mDebugApp) || dumpPackage.equals(mOrigDebugApp)) { - final long debugAppToken = proto.start(ProcessesProto.DEBUG); - proto.write(ProcessesProto.DebugApp.DEBUG_APP, mDebugApp); - proto.write(ProcessesProto.DebugApp.ORIG_DEBUG_APP, mOrigDebugApp); - proto.write(ProcessesProto.DebugApp.DEBUG_TRANSIENT, mDebugTransient); - proto.write(ProcessesProto.DebugApp.ORIG_WAIT_FOR_DEBUGGER, mOrigWaitForDebugger); + final long debugAppToken = proto.start(ActivityManagerServiceDumpProcessesProto.DEBUG); + proto.write(ActivityManagerServiceDumpProcessesProto.DebugApp.DEBUG_APP, mDebugApp); + proto.write(ActivityManagerServiceDumpProcessesProto.DebugApp.ORIG_DEBUG_APP, mOrigDebugApp); + proto.write(ActivityManagerServiceDumpProcessesProto.DebugApp.DEBUG_TRANSIENT, mDebugTransient); + proto.write(ActivityManagerServiceDumpProcessesProto.DebugApp.ORIG_WAIT_FOR_DEBUGGER, mOrigWaitForDebugger); proto.end(debugAppToken); } } if (mCurAppTimeTracker != null) { - mCurAppTimeTracker.writeToProto(proto, ProcessesProto.CURRENT_TRACKER, true); + mCurAppTimeTracker.writeToProto(proto, ActivityManagerServiceDumpProcessesProto.CURRENT_TRACKER, true); } if (mMemWatchProcesses.getMap().size() > 0) { - final long token = proto.start(ProcessesProto.MEM_WATCH_PROCESSES); + final long token = proto.start(ActivityManagerServiceDumpProcessesProto.MEM_WATCH_PROCESSES); ArrayMap<String, SparseArray<Pair<Long, String>>> procs = mMemWatchProcesses.getMap(); for (int i=0; i<procs.size(); i++) { final String proc = procs.keyAt(i); final SparseArray<Pair<Long, String>> uids = procs.valueAt(i); - final long ptoken = proto.start(ProcessesProto.MemWatchProcess.PROCS); - proto.write(ProcessesProto.MemWatchProcess.Process.NAME, proc); + final long ptoken = proto.start(ActivityManagerServiceDumpProcessesProto.MemWatchProcess.PROCS); + proto.write(ActivityManagerServiceDumpProcessesProto.MemWatchProcess.Process.NAME, proc); for (int j=0; j<uids.size(); j++) { - final long utoken = proto.start(ProcessesProto.MemWatchProcess.Process.MEM_STATS); + final long utoken = proto.start(ActivityManagerServiceDumpProcessesProto.MemWatchProcess.Process.MEM_STATS); Pair<Long, String> val = uids.valueAt(j); - proto.write(ProcessesProto.MemWatchProcess.Process.MemStats.UID, uids.keyAt(j)); - proto.write(ProcessesProto.MemWatchProcess.Process.MemStats.SIZE, + proto.write(ActivityManagerServiceDumpProcessesProto.MemWatchProcess.Process.MemStats.UID, uids.keyAt(j)); + proto.write(ActivityManagerServiceDumpProcessesProto.MemWatchProcess.Process.MemStats.SIZE, DebugUtils.sizeValueToString(val.first, new StringBuilder())); - proto.write(ProcessesProto.MemWatchProcess.Process.MemStats.REPORT_TO, val.second); + proto.write(ActivityManagerServiceDumpProcessesProto.MemWatchProcess.Process.MemStats.REPORT_TO, val.second); proto.end(utoken); } proto.end(ptoken); } - final long dtoken = proto.start(ProcessesProto.MemWatchProcess.DUMP); - proto.write(ProcessesProto.MemWatchProcess.Dump.PROC_NAME, mMemWatchDumpProcName); - proto.write(ProcessesProto.MemWatchProcess.Dump.FILE, mMemWatchDumpFile); - proto.write(ProcessesProto.MemWatchProcess.Dump.PID, mMemWatchDumpPid); - proto.write(ProcessesProto.MemWatchProcess.Dump.UID, mMemWatchDumpUid); + final long dtoken = proto.start(ActivityManagerServiceDumpProcessesProto.MemWatchProcess.DUMP); + proto.write(ActivityManagerServiceDumpProcessesProto.MemWatchProcess.Dump.PROC_NAME, mMemWatchDumpProcName); + proto.write(ActivityManagerServiceDumpProcessesProto.MemWatchProcess.Dump.FILE, mMemWatchDumpFile); + proto.write(ActivityManagerServiceDumpProcessesProto.MemWatchProcess.Dump.PID, mMemWatchDumpPid); + proto.write(ActivityManagerServiceDumpProcessesProto.MemWatchProcess.Dump.UID, mMemWatchDumpUid); proto.end(dtoken); proto.end(token); @@ -17116,58 +17119,58 @@ public class ActivityManagerService extends IActivityManager.Stub if (mTrackAllocationApp != null) { if (dumpPackage == null || dumpPackage.equals(mTrackAllocationApp)) { - proto.write(ProcessesProto.TRACK_ALLOCATION_APP, mTrackAllocationApp); + proto.write(ActivityManagerServiceDumpProcessesProto.TRACK_ALLOCATION_APP, mTrackAllocationApp); } } if (mProfileApp != null || mProfileProc != null || (mProfilerInfo != null && (mProfilerInfo.profileFile != null || mProfilerInfo.profileFd != null))) { if (dumpPackage == null || dumpPackage.equals(mProfileApp)) { - final long token = proto.start(ProcessesProto.PROFILE); - proto.write(ProcessesProto.Profile.APP_NAME, mProfileApp); - mProfileProc.writeToProto(proto,ProcessesProto.Profile.PROC); + final long token = proto.start(ActivityManagerServiceDumpProcessesProto.PROFILE); + proto.write(ActivityManagerServiceDumpProcessesProto.Profile.APP_NAME, mProfileApp); + mProfileProc.writeToProto(proto,ActivityManagerServiceDumpProcessesProto.Profile.PROC); if (mProfilerInfo != null) { - mProfilerInfo.writeToProto(proto, ProcessesProto.Profile.INFO); - proto.write(ProcessesProto.Profile.TYPE, mProfileType); + mProfilerInfo.writeToProto(proto, ActivityManagerServiceDumpProcessesProto.Profile.INFO); + proto.write(ActivityManagerServiceDumpProcessesProto.Profile.TYPE, mProfileType); } proto.end(token); } } if (dumpPackage == null || dumpPackage.equals(mNativeDebuggingApp)) { - proto.write(ProcessesProto.NATIVE_DEBUGGING_APP, mNativeDebuggingApp); + proto.write(ActivityManagerServiceDumpProcessesProto.NATIVE_DEBUGGING_APP, mNativeDebuggingApp); } if (dumpPackage == null) { - proto.write(ProcessesProto.ALWAYS_FINISH_ACTIVITIES, mAlwaysFinishActivities); + proto.write(ActivityManagerServiceDumpProcessesProto.ALWAYS_FINISH_ACTIVITIES, mAlwaysFinishActivities); if (mController != null) { - final long token = proto.start(ProcessesProto.CONTROLLER); - proto.write(ProcessesProto.Controller.CONTROLLER, mController.toString()); - proto.write(ProcessesProto.Controller.IS_A_MONKEY, mControllerIsAMonkey); + final long token = proto.start(ActivityManagerServiceDumpProcessesProto.CONTROLLER); + proto.write(ActivityManagerServiceDumpProcessesProto.Controller.CONTROLLER, mController.toString()); + proto.write(ActivityManagerServiceDumpProcessesProto.Controller.IS_A_MONKEY, mControllerIsAMonkey); proto.end(token); } - proto.write(ProcessesProto.TOTAL_PERSISTENT_PROCS, numPers); - proto.write(ProcessesProto.PROCESSES_READY, mProcessesReady); - proto.write(ProcessesProto.SYSTEM_READY, mSystemReady); - proto.write(ProcessesProto.BOOTED, mBooted); - proto.write(ProcessesProto.FACTORY_TEST, mFactoryTest); - proto.write(ProcessesProto.BOOTING, mBooting); - proto.write(ProcessesProto.CALL_FINISH_BOOTING, mCallFinishBooting); - proto.write(ProcessesProto.BOOT_ANIMATION_COMPLETE, mBootAnimationComplete); - proto.write(ProcessesProto.LAST_POWER_CHECK_UPTIME_MS, mLastPowerCheckUptime); - mStackSupervisor.mGoingToSleep.writeToProto(proto, ProcessesProto.GOING_TO_SLEEP); - mStackSupervisor.mLaunchingActivity.writeToProto(proto, ProcessesProto.LAUNCHING_ACTIVITY); - proto.write(ProcessesProto.ADJ_SEQ, mAdjSeq); - proto.write(ProcessesProto.LRU_SEQ, mLruSeq); - proto.write(ProcessesProto.NUM_NON_CACHED_PROCS, mNumNonCachedProcs); - proto.write(ProcessesProto.NUM_SERVICE_PROCS, mNumServiceProcs); - proto.write(ProcessesProto.NEW_NUM_SERVICE_PROCS, mNewNumServiceProcs); - proto.write(ProcessesProto.ALLOW_LOWER_MEM_LEVEL, mAllowLowerMemLevel); - proto.write(ProcessesProto.LAST_MEMORY_LEVEL, mLastMemoryLevel); - proto.write(ProcessesProto.LAST_NUM_PROCESSES, mLastNumProcesses); + proto.write(ActivityManagerServiceDumpProcessesProto.TOTAL_PERSISTENT_PROCS, numPers); + proto.write(ActivityManagerServiceDumpProcessesProto.PROCESSES_READY, mProcessesReady); + proto.write(ActivityManagerServiceDumpProcessesProto.SYSTEM_READY, mSystemReady); + proto.write(ActivityManagerServiceDumpProcessesProto.BOOTED, mBooted); + proto.write(ActivityManagerServiceDumpProcessesProto.FACTORY_TEST, mFactoryTest); + proto.write(ActivityManagerServiceDumpProcessesProto.BOOTING, mBooting); + proto.write(ActivityManagerServiceDumpProcessesProto.CALL_FINISH_BOOTING, mCallFinishBooting); + proto.write(ActivityManagerServiceDumpProcessesProto.BOOT_ANIMATION_COMPLETE, mBootAnimationComplete); + proto.write(ActivityManagerServiceDumpProcessesProto.LAST_POWER_CHECK_UPTIME_MS, mLastPowerCheckUptime); + mStackSupervisor.mGoingToSleep.writeToProto(proto, ActivityManagerServiceDumpProcessesProto.GOING_TO_SLEEP); + mStackSupervisor.mLaunchingActivity.writeToProto(proto, ActivityManagerServiceDumpProcessesProto.LAUNCHING_ACTIVITY); + proto.write(ActivityManagerServiceDumpProcessesProto.ADJ_SEQ, mAdjSeq); + proto.write(ActivityManagerServiceDumpProcessesProto.LRU_SEQ, mLruSeq); + proto.write(ActivityManagerServiceDumpProcessesProto.NUM_NON_CACHED_PROCS, mNumNonCachedProcs); + proto.write(ActivityManagerServiceDumpProcessesProto.NUM_SERVICE_PROCS, mNumServiceProcs); + proto.write(ActivityManagerServiceDumpProcessesProto.NEW_NUM_SERVICE_PROCS, mNewNumServiceProcs); + proto.write(ActivityManagerServiceDumpProcessesProto.ALLOW_LOWER_MEM_LEVEL, mAllowLowerMemLevel); + proto.write(ActivityManagerServiceDumpProcessesProto.LAST_MEMORY_LEVEL, mLastMemoryLevel); + proto.write(ActivityManagerServiceDumpProcessesProto.LAST_NUM_PROCESSES, mLastNumProcesses); long now = SystemClock.uptimeMillis(); - ProtoUtils.toDuration(proto, ProcessesProto.LAST_IDLE_TIME, mLastIdleTime, now); - proto.write(ProcessesProto.LOW_RAM_SINCE_LAST_IDLE_MS, getLowRamTimeSinceIdle(now)); + ProtoUtils.toDuration(proto, ActivityManagerServiceDumpProcessesProto.LAST_IDLE_TIME, mLastIdleTime, now); + proto.write(ActivityManagerServiceDumpProcessesProto.LOW_RAM_SINCE_LAST_IDLE_MS, getLowRamTimeSinceIdle(now)); } } @@ -17477,15 +17480,15 @@ public class ActivityManagerService extends IActivityManager.Stub Iterator it = mRegisteredReceivers.values().iterator(); while (it.hasNext()) { ReceiverList r = (ReceiverList)it.next(); - r.writeToProto(proto, BroadcastProto.RECEIVER_LIST); + r.writeToProto(proto, ActivityManagerServiceDumpBroadcastsProto.RECEIVER_LIST); } } - mReceiverResolver.writeToProto(proto, BroadcastProto.RECEIVER_RESOLVER); + mReceiverResolver.writeToProto(proto, ActivityManagerServiceDumpBroadcastsProto.RECEIVER_RESOLVER); for (BroadcastQueue q : mBroadcastQueues) { - q.writeToProto(proto, BroadcastProto.BROADCAST_QUEUE); + q.writeToProto(proto, ActivityManagerServiceDumpBroadcastsProto.BROADCAST_QUEUE); } for (int user=0; user<mStickyBroadcasts.size(); user++) { - long token = proto.start(BroadcastProto.STICKY_BROADCASTS); + long token = proto.start(ActivityManagerServiceDumpBroadcastsProto.STICKY_BROADCASTS); proto.write(StickyBroadcastProto.USER, mStickyBroadcasts.keyAt(user)); for (Map.Entry<String, ArrayList<Intent>> ent : mStickyBroadcasts.valueAt(user).entrySet()) { @@ -17500,9 +17503,10 @@ public class ActivityManagerService extends IActivityManager.Stub proto.end(token); } - long handlerToken = proto.start(BroadcastProto.HANDLER); - proto.write(BroadcastProto.MainHandler.HANDLER, mHandler.toString()); - mHandler.getLooper().writeToProto(proto, BroadcastProto.MainHandler.LOOPER); + long handlerToken = proto.start(ActivityManagerServiceDumpBroadcastsProto.HANDLER); + proto.write(ActivityManagerServiceDumpBroadcastsProto.MainHandler.HANDLER, mHandler.toString()); + mHandler.getLooper().writeToProto(proto, + ActivityManagerServiceDumpBroadcastsProto.MainHandler.LOOPER); proto.end(handlerToken); } @@ -18264,17 +18268,17 @@ public class ActivityManagerService extends IActivityManager.Stub MemItem mi = items.get(i); final long token = proto.start(fieldId); - proto.write(MemInfoProto.MemItem.TAG, tag); - proto.write(MemInfoProto.MemItem.LABEL, mi.shortLabel); - proto.write(MemInfoProto.MemItem.IS_PROC, mi.isProc); - proto.write(MemInfoProto.MemItem.ID, mi.id); - proto.write(MemInfoProto.MemItem.HAS_ACTIVITIES, mi.hasActivities); - proto.write(MemInfoProto.MemItem.PSS_KB, mi.pss); + proto.write(MemInfoDumpProto.MemItem.TAG, tag); + proto.write(MemInfoDumpProto.MemItem.LABEL, mi.shortLabel); + proto.write(MemInfoDumpProto.MemItem.IS_PROC, mi.isProc); + proto.write(MemInfoDumpProto.MemItem.ID, mi.id); + proto.write(MemInfoDumpProto.MemItem.HAS_ACTIVITIES, mi.hasActivities); + proto.write(MemInfoDumpProto.MemItem.PSS_KB, mi.pss); if (dumpSwapPss) { - proto.write(MemInfoProto.MemItem.SWAP_PSS_KB, mi.swapPss); + proto.write(MemInfoDumpProto.MemItem.SWAP_PSS_KB, mi.swapPss); } if (mi.subitems != null) { - dumpMemItems(proto, MemInfoProto.MemItem.SUB_ITEMS, mi.shortLabel, mi.subitems, + dumpMemItems(proto, MemInfoDumpProto.MemItem.SUB_ITEMS, mi.shortLabel, mi.subitems, true, dumpSwapPss); } proto.end(token); @@ -19028,16 +19032,16 @@ public class ActivityManagerService extends IActivityManager.Stub if (nativeProcs.size() > 0) { ProtoOutputStream proto = new ProtoOutputStream(fd); - proto.write(MemInfoProto.UPTIME_DURATION_MS, uptimeMs); - proto.write(MemInfoProto.ELAPSED_REALTIME_MS, realtimeMs); + proto.write(MemInfoDumpProto.UPTIME_DURATION_MS, uptimeMs); + proto.write(MemInfoDumpProto.ELAPSED_REALTIME_MS, realtimeMs); Debug.MemoryInfo mi = null; for (int i = nativeProcs.size() - 1 ; i >= 0 ; i--) { final ProcessCpuTracker.Stats r = nativeProcs.get(i); final int pid = r.pid; - final long nToken = proto.start(MemInfoProto.NATIVE_PROCESSES); + final long nToken = proto.start(MemInfoDumpProto.NATIVE_PROCESSES); - proto.write(MemInfoProto.ProcessMemory.PID, pid); - proto.write(MemInfoProto.ProcessMemory.PROCESS_NAME, r.baseName); + proto.write(MemInfoDumpProto.ProcessMemory.PID, pid); + proto.write(MemInfoDumpProto.ProcessMemory.PROCESS_NAME, r.baseName); if (mi == null) { mi = new Debug.MemoryInfo(); @@ -19069,8 +19073,8 @@ public class ActivityManagerService extends IActivityManager.Stub ProtoOutputStream proto = new ProtoOutputStream(fd); - proto.write(MemInfoProto.UPTIME_DURATION_MS, uptimeMs); - proto.write(MemInfoProto.ELAPSED_REALTIME_MS, realtimeMs); + proto.write(MemInfoDumpProto.UPTIME_DURATION_MS, uptimeMs); + proto.write(MemInfoDumpProto.ELAPSED_REALTIME_MS, realtimeMs); ArrayList<MemItem> procMems = new ArrayList<MemItem>(); final SparseArray<MemItem> procMemsMap = new SparseArray<MemItem>(); @@ -19135,10 +19139,10 @@ public class ActivityManagerService extends IActivityManager.Stub } if (opts.dumpDetails) { if (opts.localOnly) { - final long aToken = proto.start(MemInfoProto.APP_PROCESSES); - final long mToken = proto.start(MemInfoProto.AppData.PROCESS_MEMORY); - proto.write(MemInfoProto.ProcessMemory.PID, pid); - proto.write(MemInfoProto.ProcessMemory.PROCESS_NAME, r.processName); + final long aToken = proto.start(MemInfoDumpProto.APP_PROCESSES); + final long mToken = proto.start(MemInfoDumpProto.AppData.PROCESS_MEMORY); + proto.write(MemInfoDumpProto.ProcessMemory.PID, pid); + proto.write(MemInfoDumpProto.ProcessMemory.PROCESS_NAME, r.processName); ActivityThread.dumpMemInfoTable(proto, mi, opts.dumpDalvik, opts.dumpSummaryOnly, 0, 0, 0, 0, 0, 0); proto.end(mToken); @@ -19150,7 +19154,7 @@ public class ActivityManagerService extends IActivityManager.Stub thread.dumpMemInfoProto(tp.getWriteFd(), mi, opts.dumpFullDetails, opts.dumpDalvik, opts.dumpSummaryOnly, opts.dumpUnreachable, innerArgs); - proto.write(MemInfoProto.APP_PROCESSES, tp.get()); + proto.write(MemInfoDumpProto.APP_PROCESSES, tp.get()); } finally { tp.kill(); } @@ -19338,13 +19342,13 @@ public class ActivityManagerService extends IActivityManager.Stub opts.dumpSwapPss = opts.dumpSwapPss && hasSwapPss && totalSwapPss != 0; if (!opts.oomOnly) { - dumpMemItems(proto, MemInfoProto.TOTAL_PSS_BY_PROCESS, "proc", + dumpMemItems(proto, MemInfoDumpProto.TOTAL_PSS_BY_PROCESS, "proc", procMems, true, opts.dumpSwapPss); } - dumpMemItems(proto, MemInfoProto.TOTAL_PSS_BY_OOM_ADJUSTMENT, "oom", + dumpMemItems(proto, MemInfoDumpProto.TOTAL_PSS_BY_OOM_ADJUSTMENT, "oom", oomMems, false, opts.dumpSwapPss); if (!brief && !opts.oomOnly) { - dumpMemItems(proto, MemInfoProto.TOTAL_PSS_BY_CATEGORY, "cat", + dumpMemItems(proto, MemInfoDumpProto.TOTAL_PSS_BY_CATEGORY, "cat", catMems, true, opts.dumpSwapPss); } MemInfoReader memInfo = new MemInfoReader(); @@ -19362,40 +19366,40 @@ public class ActivityManagerService extends IActivityManager.Stub } } if (!brief) { - proto.write(MemInfoProto.TOTAL_RAM_KB, memInfo.getTotalSizeKb()); - proto.write(MemInfoProto.STATUS, mLastMemoryLevel); - proto.write(MemInfoProto.CACHED_PSS_KB, cachedPss); - proto.write(MemInfoProto.CACHED_KERNEL_KB, memInfo.getCachedSizeKb()); - proto.write(MemInfoProto.FREE_KB, memInfo.getFreeSizeKb()); + proto.write(MemInfoDumpProto.TOTAL_RAM_KB, memInfo.getTotalSizeKb()); + proto.write(MemInfoDumpProto.STATUS, mLastMemoryLevel); + proto.write(MemInfoDumpProto.CACHED_PSS_KB, cachedPss); + proto.write(MemInfoDumpProto.CACHED_KERNEL_KB, memInfo.getCachedSizeKb()); + proto.write(MemInfoDumpProto.FREE_KB, memInfo.getFreeSizeKb()); } long lostRAM = memInfo.getTotalSizeKb() - (totalPss - totalSwapPss) - memInfo.getFreeSizeKb() - memInfo.getCachedSizeKb() - memInfo.getKernelUsedSizeKb() - memInfo.getZramTotalSizeKb(); - proto.write(MemInfoProto.USED_PSS_KB, totalPss - cachedPss); - proto.write(MemInfoProto.USED_KERNEL_KB, memInfo.getKernelUsedSizeKb()); - proto.write(MemInfoProto.LOST_RAM_KB, lostRAM); + proto.write(MemInfoDumpProto.USED_PSS_KB, totalPss - cachedPss); + proto.write(MemInfoDumpProto.USED_KERNEL_KB, memInfo.getKernelUsedSizeKb()); + proto.write(MemInfoDumpProto.LOST_RAM_KB, lostRAM); if (!brief) { if (memInfo.getZramTotalSizeKb() != 0) { - proto.write(MemInfoProto.TOTAL_ZRAM_KB, memInfo.getZramTotalSizeKb()); - proto.write(MemInfoProto.ZRAM_PHYSICAL_USED_IN_SWAP_KB, + proto.write(MemInfoDumpProto.TOTAL_ZRAM_KB, memInfo.getZramTotalSizeKb()); + proto.write(MemInfoDumpProto.ZRAM_PHYSICAL_USED_IN_SWAP_KB, memInfo.getSwapTotalSizeKb() - memInfo.getSwapFreeSizeKb()); - proto.write(MemInfoProto.TOTAL_ZRAM_SWAP_KB, memInfo.getSwapTotalSizeKb()); + proto.write(MemInfoDumpProto.TOTAL_ZRAM_SWAP_KB, memInfo.getSwapTotalSizeKb()); } final long[] ksm = getKsmInfo(); - proto.write(MemInfoProto.KSM_SHARING_KB, ksm[KSM_SHARING]); - proto.write(MemInfoProto.KSM_SHARED_KB, ksm[KSM_SHARED]); - proto.write(MemInfoProto.KSM_UNSHARED_KB, ksm[KSM_UNSHARED]); - proto.write(MemInfoProto.KSM_VOLATILE_KB, ksm[KSM_VOLATILE]); - - proto.write(MemInfoProto.TUNING_MB, ActivityManager.staticGetMemoryClass()); - proto.write(MemInfoProto.TUNING_LARGE_MB, ActivityManager.staticGetLargeMemoryClass()); - proto.write(MemInfoProto.OOM_KB, + proto.write(MemInfoDumpProto.KSM_SHARING_KB, ksm[KSM_SHARING]); + proto.write(MemInfoDumpProto.KSM_SHARED_KB, ksm[KSM_SHARED]); + proto.write(MemInfoDumpProto.KSM_UNSHARED_KB, ksm[KSM_UNSHARED]); + proto.write(MemInfoDumpProto.KSM_VOLATILE_KB, ksm[KSM_VOLATILE]); + + proto.write(MemInfoDumpProto.TUNING_MB, ActivityManager.staticGetMemoryClass()); + proto.write(MemInfoDumpProto.TUNING_LARGE_MB, ActivityManager.staticGetLargeMemoryClass()); + proto.write(MemInfoDumpProto.OOM_KB, mProcessList.getMemLevel(ProcessList.CACHED_APP_MAX_ADJ) / 1024); - proto.write(MemInfoProto.RESTORE_LIMIT_KB, + proto.write(MemInfoDumpProto.RESTORE_LIMIT_KB, mProcessList.getCachedRestoreThresholdKb()); - proto.write(MemInfoProto.IS_LOW_RAM_DEVICE, ActivityManager.isLowRamDeviceStatic()); - proto.write(MemInfoProto.IS_HIGH_END_GFX, ActivityManager.isHighEndGfx()); + proto.write(MemInfoDumpProto.IS_LOW_RAM_DEVICE, ActivityManager.isLowRamDeviceStatic()); + proto.write(MemInfoDumpProto.IS_HIGH_END_GFX, ActivityManager.isHighEndGfx()); } } diff --git a/services/core/java/com/android/server/am/ActivityStackSupervisor.java b/services/core/java/com/android/server/am/ActivityStackSupervisor.java index 0157c7c3fd9a..26ffe9529982 100644 --- a/services/core/java/com/android/server/am/ActivityStackSupervisor.java +++ b/services/core/java/com/android/server/am/ActivityStackSupervisor.java @@ -3777,7 +3777,8 @@ public class ActivityStackSupervisor extends ConfigurationContainer implements D mService.mLockTaskController.dump(pw, prefix); } - public void writeToProto(ProtoOutputStream proto) { + public void writeToProto(ProtoOutputStream proto, long fieldId) { + final long token = proto.start(fieldId); super.writeToProto(proto, CONFIGURATION_CONTAINER, false /* trim */); for (int displayNdx = 0; displayNdx < mActivityDisplays.size(); ++displayNdx) { ActivityDisplay activityDisplay = mActivityDisplays.valueAt(displayNdx); @@ -3795,6 +3796,7 @@ public class ActivityStackSupervisor extends ConfigurationContainer implements D } proto.write(IS_HOME_RECENTS_COMPONENT, mRecentTasks.isRecentsComponentHomeActivity(mCurrentUser)); + proto.end(token); } /** diff --git a/services/core/java/com/android/server/am/VrController.java b/services/core/java/com/android/server/am/VrController.java index d32db7ea2ed9..9d34a8020345 100644 --- a/services/core/java/com/android/server/am/VrController.java +++ b/services/core/java/com/android/server/am/VrController.java @@ -24,7 +24,7 @@ import android.util.proto.ProtoOutputStream; import android.util.proto.ProtoUtils; import com.android.server.LocalServices; -import com.android.server.am.proto.ProcessesProto.VrControllerProto; +import com.android.server.am.proto.ActivityManagerServiceDumpProcessesProto.VrControllerProto; import com.android.server.vr.VrManagerInternal; /** diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java index 1521afc1b059..bab4399d76ad 100644 --- a/services/core/java/com/android/server/wm/WindowManagerService.java +++ b/services/core/java/com/android/server/wm/WindowManagerService.java @@ -100,15 +100,15 @@ import static com.android.server.wm.WindowManagerDebugConfig.SHOW_VERBOSE_TRANSA import static com.android.server.wm.WindowManagerDebugConfig.TAG_KEEP_SCREEN_ON; import static com.android.server.wm.WindowManagerDebugConfig.TAG_WITH_CLASS_NAME; import static com.android.server.wm.WindowManagerDebugConfig.TAG_WM; -import static com.android.server.wm.proto.WindowManagerServiceProto.APP_TRANSITION; -import static com.android.server.wm.proto.WindowManagerServiceProto.DISPLAY_FROZEN; -import static com.android.server.wm.proto.WindowManagerServiceProto.FOCUSED_APP; -import static com.android.server.wm.proto.WindowManagerServiceProto.FOCUSED_WINDOW; -import static com.android.server.wm.proto.WindowManagerServiceProto.INPUT_METHOD_WINDOW; -import static com.android.server.wm.proto.WindowManagerServiceProto.LAST_ORIENTATION; -import static com.android.server.wm.proto.WindowManagerServiceProto.POLICY; -import static com.android.server.wm.proto.WindowManagerServiceProto.ROOT_WINDOW_CONTAINER; -import static com.android.server.wm.proto.WindowManagerServiceProto.ROTATION; +import static com.android.server.wm.proto.WindowManagerServiceDumpProto.APP_TRANSITION; +import static com.android.server.wm.proto.WindowManagerServiceDumpProto.DISPLAY_FROZEN; +import static com.android.server.wm.proto.WindowManagerServiceDumpProto.FOCUSED_APP; +import static com.android.server.wm.proto.WindowManagerServiceDumpProto.FOCUSED_WINDOW; +import static com.android.server.wm.proto.WindowManagerServiceDumpProto.INPUT_METHOD_WINDOW; +import static com.android.server.wm.proto.WindowManagerServiceDumpProto.LAST_ORIENTATION; +import static com.android.server.wm.proto.WindowManagerServiceDumpProto.POLICY; +import static com.android.server.wm.proto.WindowManagerServiceDumpProto.ROOT_WINDOW_CONTAINER; +import static com.android.server.wm.proto.WindowManagerServiceDumpProto.ROTATION; import android.Manifest; import android.Manifest.permission; @@ -6195,7 +6195,7 @@ public class WindowManagerService extends IWindowManager.Stub /** * Write to a protocol buffer output stream. Protocol buffer message definition is at - * {@link com.android.server.wm.proto.WindowManagerServiceProto}. + * {@link com.android.server.wm.proto.WindowManagerServiceDumpProto}. * * @param proto Stream to write the WindowContainer object to. * @param trim If true, reduce the amount of data written. |