Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1bc7222b authored by Jing Ji's avatar Jing Ji Committed by Android (Google) Code Review
Browse files

Merge "Fix the value of RSS total in meminfo dump"

parents b4e6d721 a122ed81

core/java/android/app/ActivityThread.java

+1 −1
Original line number Diff line number Diff line
@@ -2791,7 +2791,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);

            }