Merge "Include KReclaimable meminfo field into getMemInfo results" am: f61d2347c0 am: 215e1d5e27 am: d23e6f7b09

Change-Id: I3d0f27c2ca0471af8058b86a7d1510cd246fda87
2019-12-19 06:38:58 +00:00
parent c314813f99 d23e6f7b09
commit 1f5d183def
2 changed files with 8 additions and 1 deletions
--- a/core/java/android/os/Debug.java
+++ b/core/java/android/os/Debug.java
@@ -1938,8 +1938,14 @@ public final class Debug
    public static final int MEMINFO_PAGE_TABLES = 13;
    /** @hide */
    public static final int MEMINFO_KERNEL_STACK = 14;
+    /**
+     * Note: MEMINFO_KRECLAIMABLE includes MEMINFO_SLAB_RECLAIMABLE (see KReclaimable field
+     * description in kernel documentation).
+     * @hide
+     */
+    public static final int MEMINFO_KRECLAIMABLE = 15;
    /** @hide */
-    public static final int MEMINFO_COUNT = 15;
+    public static final int MEMINFO_COUNT = 16;

    /**
     * Retrieves /proc/meminfo.  outSizes is filled with fields
--- a/core/jni/android_os_Debug.cpp
+++ b/core/jni/android_os_Debug.cpp
@@ -560,6 +560,7 @@ enum {
    MEMINFO_VMALLOC_USED,
    MEMINFO_PAGE_TABLES,
    MEMINFO_KERNEL_STACK,
+    MEMINFO_KERNEL_RECLAIMABLE,
    MEMINFO_COUNT
 };