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

Commit f40969ac authored by Thierry Strudel's avatar Thierry Strudel Committed by Android (Google) Code Review
Browse files

Merge "Fix typo in SwappedOut reporting" into nyc-dev

parents 7f220b8e 9b51160e

core/java/android/app/ActivityThread.java

+2 −2
Original line number Diff line number Diff line
@@ -2241,8 +2241,8 @@ public final class ActivityThread { 
                        memInfo.getTotalSwappablePss(),

                        memInfo.getTotalSharedDirty(), memInfo.getTotalPrivateDirty(),

                        memInfo.getTotalSharedClean(), memInfo.getTotalPrivateClean(),

                        memInfo.hasSwappedOutPss ? memInfo.getTotalSwappedOut() :

                        memInfo.getTotalSwappedOutPss(),

                        memInfo.hasSwappedOutPss ? memInfo.getTotalSwappedOutPss() :

                        memInfo.getTotalSwappedOut(),

                        nativeMax+dalvikMax, nativeAllocated+dalvikAllocated,

                        nativeFree+dalvikFree);

            } else {