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

Commit a1b1d3b9 authored by Jing Ji's avatar Jing Ji Committed by Android (Google) Code Review
Browse files

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

parents c59512f4 3a7338ff

core/proto/android/server/activitymanagerservice.proto

+2 −4
Original line number Diff line number Diff line
@@ -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;

    }

services/core/java/com/android/server/am/ActivityManagerService.java

+2 −5
Original line number Diff line number Diff line
@@ -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);

            }

            if (dumpSwapPss) {

                proto.write(MemInfoDumpProto.MemItem.SWAP_PSS_KB, mi.swapPss);

            }