Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Include both RSS and PSS info in MemItem protobuf dump"

Browse Source
This commit is contained in:
Jing Ji
2019-08-20 20:36:24 +00:00
committed by Android (Google) Code Review
parent c59512f4cc 3a7338ff6c
commit a1b1d3b915
2 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/proto/android/server/activitymanagerservice.proto
View File

@@ -367,10 +367,8 @@ message MemInfoDumpProto {
optional int32 id = 3;
optional bool is_proc = 4;
optional bool has_activities = 5;
oneof ss_kb {
int64 pss_kb = 6;
int64 rss_kb = 9;
}
optional int64 pss_kb = 6;
optional int64 rss_kb = 9;
optional int64 swap_pss_kb = 7;
repeated MemItem sub_items = 8;
}

7
services/core/java/com/android/server/am/ActivityManagerService.java
View File

@@ -12230,11 +12230,8 @@ public class ActivityManagerService extends IActivityManager.Stub
proto.write(MemInfoDumpProto.MemItem.IS_PROC, mi.isProc);
proto.write(MemInfoDumpProto.MemItem.ID, mi.id);
proto.write(MemInfoDumpProto.MemItem.HAS_ACTIVITIES, mi.hasActivities);
if (dumpPss) {
proto.write(MemInfoDumpProto.MemItem.PSS_KB, mi.pss);
} else {
proto.write(MemInfoDumpProto.MemItem.RSS_KB, mi.mRss);
}
proto.write(MemInfoDumpProto.MemItem.PSS_KB, mi.pss);
proto.write(MemInfoDumpProto.MemItem.RSS_KB, mi.mRss);
if (dumpSwapPss) {
proto.write(MemInfoDumpProto.MemItem.SWAP_PSS_KB, mi.swapPss);
}