Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix worng value of 'TOTAL of Rss Total' when dumpsys meminfo" am: 90e336819c

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1625700

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5f2b8b675e460284ca4489ed4e08fe8695b5d816
This commit is contained in:
Riddle Hsu
2021-03-10 16:03:28 +00:00
committed by Automerger Merge Worker
parent 6f901df16a 90e336819c
commit 5028f8923a
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/app/ActivityThread.java
View File

@@ -2770,7 +2770,7 @@ public final class ActivityThread extends ClientTransactionHandler {
memInfo.getTotalPrivateDirty(), memInfo.getTotalPrivateDirty(),
memInfo.getTotalPrivateClean(), memInfo.getTotalPrivateClean(),
memInfo.hasSwappedOutPss ? memInfo.getTotalSwappedOutPss() : memInfo.hasSwappedOutPss ? memInfo.getTotalSwappedOutPss() :
memInfo.getTotalSwappedOut(), memInfo.getTotalPss(), memInfo.getTotalSwappedOut(), memInfo.getTotalRss(),
nativeMax+dalvikMax, nativeMax+dalvikMax,
nativeAllocated+dalvikAllocated, nativeFree+dalvikFree); nativeAllocated+dalvikAllocated, nativeFree+dalvikFree);
} }