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

Commit 91702eb3 authored by Richard Uhler's avatar Richard Uhler
Browse files

Fix bug in reporting SwapPss in dumpsys meminfo. 

Bug: 29875093
Test: Run dumpsys meminfo -a, verify SwapPss adds up and is non-zero
      for dalvik and native.

Change-Id: I79d0b6a59bf5f4e73f75f0b9540ec0fcc9e23b02
parent 2d8b429b

core/java/android/app/ActivityThread.java

+2 −2
Original line number Diff line number Diff line
@@ -2361,13 +2361,13 @@ public final class ActivityThread { 
                        memInfo.nativeSwappablePss, memInfo.nativeSharedDirty,

                        memInfo.nativePrivateDirty, memInfo.nativeSharedClean,

                        memInfo.nativePrivateClean, memInfo.hasSwappedOutPss ?

                        memInfo.nativeSwappedOut : memInfo.nativeSwappedOutPss,

                        memInfo.nativeSwappedOutPss : memInfo.nativeSwappedOut,

                        nativeMax, nativeAllocated, nativeFree);

                printRow(pw, HEAP_FULL_COLUMN, "Dalvik Heap", memInfo.dalvikPss,

                        memInfo.dalvikSwappablePss, memInfo.dalvikSharedDirty,

                        memInfo.dalvikPrivateDirty, memInfo.dalvikSharedClean,

                        memInfo.dalvikPrivateClean, memInfo.hasSwappedOutPss ?

                        memInfo.dalvikSwappedOut : memInfo.dalvikSwappedOutPss,

                        memInfo.dalvikSwappedOutPss : memInfo.dalvikSwappedOut,

                        dalvikMax, dalvikAllocated, dalvikFree);

            } else {

                printRow(pw, HEAP_COLUMN, "", "Pss", "Private",

core/java/android/os/Debug.java

+4 −0
Original line number Diff line number Diff line
@@ -699,6 +699,7 @@ public final class Debug 
            dest.writeInt(dalvikPrivateClean);

            dest.writeInt(dalvikSharedClean);

            dest.writeInt(dalvikSwappedOut);

            dest.writeInt(dalvikSwappedOutPss);

            dest.writeInt(nativePss);

            dest.writeInt(nativeSwappablePss);

            dest.writeInt(nativePrivateDirty);
@@ -706,6 +707,7 @@ public final class Debug 
            dest.writeInt(nativePrivateClean);

            dest.writeInt(nativeSharedClean);

            dest.writeInt(nativeSwappedOut);

            dest.writeInt(nativeSwappedOutPss);

            dest.writeInt(otherPss);

            dest.writeInt(otherSwappablePss);

            dest.writeInt(otherPrivateDirty);
@@ -726,6 +728,7 @@ public final class Debug 
            dalvikPrivateClean = source.readInt();

            dalvikSharedClean = source.readInt();

            dalvikSwappedOut = source.readInt();

            dalvikSwappedOutPss = source.readInt();

            nativePss = source.readInt();

            nativeSwappablePss = source.readInt();

            nativePrivateDirty = source.readInt();
@@ -733,6 +736,7 @@ public final class Debug 
            nativePrivateClean = source.readInt();

            nativeSharedClean = source.readInt();

            nativeSwappedOut = source.readInt();

            nativeSwappedOutPss = source.readInt();

            otherPss = source.readInt();

            otherSwappablePss = source.readInt();

            otherPrivateDirty = source.readInt();