Fix issue #28400000: Settings memory UI still showing z-ram...

...but probably shouldn't.

Keep track of whether zram is being included in per-process pss and,
if so, don't add it on separately.

Change-Id: Ic945fc3deca8412272bb6019fe1be4b878cb763a

1 files changed, 9 insertions, 0 deletions

diff --git a/core/java/android/os/Debug.java b/core/java/android/os/Debug.java
index 55b107a215e4..175d883da29d 100644
--- a/core/java/android/os/Debug.java
+++ b/core/java/android/os/Debug.java
@@ -676,6 +676,15 @@ public final class Debug
             return getTotalSwappedOutPss();
         }
 
+        /**
+         * Return true if the kernel is reporting pss swapped out...  that is, if
+         * {@link #getSummaryTotalSwapPss()} will return non-0 values.
+         * @hide
+         */
+        public boolean hasSwappedOutPss() {
+            return hasSwappedOutPss;
+        }
+
         public int describeContents() {
             return 0;
         }