commit cf1c563fdd9c85727b023fe3c9fe5a4376c71d55
author Martijn Coenen <maco@google.com> Wed Feb 14 11:15:37 2018 +0000
committer android-build-merger <android-build-merger@google.com> Wed Feb 14 11:15:37 2018 +0000
tree 8adca206c99d7e13763ce5b3e2cfd6d1ac34c8c4
parent 1bb6046a066899d0257042ebd3dd9b00cdca7510
parent c3af6331e5374367a51a3c5ca21201bcb91bf38a

Merge "add swapPss of native process to totalSwapPss" am: 0db84fcc8f
am: c3af6331e5

Change-Id: I4e8dbdd04ae92d1b6882ac476e8b4990a34bbb27

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

diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index 1869460..2c80948 100644
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -17493,6 +17493,7 @@
                         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 + ")",