commit c3af6331e5374367a51a3c5ca21201bcb91bf38a
author Martijn Coenen <maco@google.com> Wed Feb 14 11:08:54 2018 +0000
committer android-build-merger <android-build-merger@google.com> Wed Feb 14 11:08:54 2018 +0000
tree fd4e42512ed7e799a1c83783700df2512c86018b
parent 9b13db093882156ca5db38a628ffb6c34ba67ec6
parent 0db84fcc8f1fdd1cd304225dc49bcba0c39d41e8

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

Change-Id: I615e245f2f0f50f2afe8726ada55a81101fce6bb

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 ec0dd39..bc055a7 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 + ")",