Merge "add swapPss of native process to totalSwapPss"

am: 0db84fcc8f Change-Id: I615e245f2f0f50f2afe8726ada55a81101fce6bb
2018-02-14 11:08:54 +00:00
parent 9b13db0938 0db84fcc8f
commit c3af6331e5
1 changed files with 1 additions and 0 deletions
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -17493,6 +17493,7 @@ public class ActivityManagerService extends IActivityManager.Stub
                        final long myTotalPss = mi.getTotalPss();
                        final long myTotalSwapPss = mi.getTotalSwappedOutPss();
                        totalPss += myTotalPss;
+                        totalSwapPss += myTotalSwapPss;
                        nativeProcTotalPss += myTotalPss;

                        MemItem pssItem = new MemItem(st.name + " (pid " + st.pid + ")",