commit 90e336819ce160ac7a75633d3160516f25fbe167
author Riddle Hsu <riddlehsu@google.com> Wed Mar 10 15:13:14 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Mar 10 15:13:14 2021 +0000
tree 5b561148397f07537792a74d42e1e11b0e43bafe
parent a4e69024bbb588eddc187685500178e0a4d113dd
parent af6f90bbf1c6155a1ff55a63c1e1138d345da8bb

Merge "Fix worng value of 'TOTAL of Rss Total' when dumpsys meminfo"

core/java/android/app/ActivityThread.java

diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java
index b99d5cd..65f2c02 100644
--- a/core/java/android/app/ActivityThread.java
+++ b/core/java/android/app/ActivityThread.java
@@ -2770,7 +2770,7 @@
                         memInfo.getTotalPrivateDirty(),
                         memInfo.getTotalPrivateClean(),
                         memInfo.hasSwappedOutPss ? memInfo.getTotalSwappedOutPss() :
-                        memInfo.getTotalSwappedOut(), memInfo.getTotalPss(),
+                        memInfo.getTotalSwappedOut(), memInfo.getTotalRss(),
                         nativeMax+dalvikMax,
                         nativeAllocated+dalvikAllocated, nativeFree+dalvikFree);
             }