summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRiddle Hsu <riddlehsu@google.com>2021-03-10 15:13:14 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2021-03-10 15:13:14 +0000
commit90e336819ce160ac7a75633d3160516f25fbe167 (patch)
tree5b561148397f07537792a74d42e1e11b0e43bafe
parenta4e69024bbb588eddc187685500178e0a4d113dd (diff)
parentaf6f90bbf1c6155a1ff55a63c1e1138d345da8bb (diff)
Merge "Fix worng value of 'TOTAL of Rss Total' when dumpsys meminfo"
-rw-r--r--core/java/android/app/ActivityThread.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java
index b99d5cd13a77..65f2c02faa85 100644
--- a/core/java/android/app/ActivityThread.java
+++ b/core/java/android/app/ActivityThread.java
@@ -2770,7 +2770,7 @@ public final class ActivityThread extends ClientTransactionHandler {
memInfo.getTotalPrivateDirty(),
memInfo.getTotalPrivateClean(),
memInfo.hasSwappedOutPss ? memInfo.getTotalSwappedOutPss() :
- memInfo.getTotalSwappedOut(), memInfo.getTotalPss(),
+ memInfo.getTotalSwappedOut(), memInfo.getTotalRss(),
nativeMax+dalvikMax,
nativeAllocated+dalvikAllocated, nativeFree+dalvikFree);
}