Merge "Include both RSS and PSS info in MemItem protobuf dump"
diff --git a/core/proto/android/server/activitymanagerservice.proto b/core/proto/android/server/activitymanagerservice.proto
index a1ff9b9..d54b6b0 100644
--- a/core/proto/android/server/activitymanagerservice.proto
+++ b/core/proto/android/server/activitymanagerservice.proto
@@ -367,10 +367,8 @@
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;
}
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index 7ef6032..9caceae 100644
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -12230,11 +12230,8 @@
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);
}