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

Commit 3a7338ff authored by Jing Ji's avatar Jing Ji
Browse files

Include both RSS and PSS info in MemItem protobuf dump 

Bug: 117880513
Test: adb shell incident meminfo | incident_report -i -
Test: cts-tradefed run cts-dev --module \
      CtsIncidentHostTestCases --test \
      com.android.server.cts.MemInfoIncidentTest

Change-Id: I5445418f037004d66f1ec44fd91dd394f3776ca4
parent 4969b938

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
@@ -12204,11 +12204,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);

            }