summaryrefslogtreecommitdiff
path: root/core/java/android/os/Debug.java
diff options
context:
space:
mode:
authorRichard Uhler <ruhler@google.com>2017-06-23 16:54:25 +0100
committerRichard Uhler <ruhler@google.com>2017-06-23 16:54:25 +0100
commit91702eb391f1bb152628dc45d0e8acceacf6fd59 (patch)
treec1c3948fde9337ca135f9cc262c223ce980d5846 /core/java/android/os/Debug.java
parent2d8b429bb4130d574aeb0c0a4fddc4c38f559424 (diff)
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
Diffstat (limited to 'core/java/android/os/Debug.java')
-rw-r--r--core/java/android/os/Debug.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/core/java/android/os/Debug.java b/core/java/android/os/Debug.java
index fa854b078292..f243f377cb56 100644
--- a/core/java/android/os/Debug.java
+++ b/core/java/android/os/Debug.java
@@ -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();