commit f61d2347c05bdc948d9662e7a40710a871a3d6bb
author Suren Baghdasaryan <surenb@google.com> Thu Dec 19 05:25:38 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Dec 19 05:25:38 2019 +0000
tree d339d43854aa890f5d3088a09a8778875d5dfd8f
parent 30642b395c17c1cf4dabe1e40cccfd6c59e30049
parent 5f8e17b3ef5f258684b729ead30d95e9e4562c75

Merge "Include KReclaimable meminfo field into getMemInfo results"

core/java/android/os/Debug.java

diff --git a/core/java/android/os/Debug.java b/core/java/android/os/Debug.java
index 4ed7b17..bf26a41 100644
--- a/core/java/android/os/Debug.java
+++ b/core/java/android/os/Debug.java
@@ -1874,8 +1874,14 @@
     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

core/jni/android_os_Debug.cpp

diff --git a/core/jni/android_os_Debug.cpp b/core/jni/android_os_Debug.cpp
index 81957f5..6aed1e8 100644
--- a/core/jni/android_os_Debug.cpp
+++ b/core/jni/android_os_Debug.cpp
@@ -560,6 +560,7 @@
     MEMINFO_VMALLOC_USED,
     MEMINFO_PAGE_TABLES,
     MEMINFO_KERNEL_STACK,
+    MEMINFO_KERNEL_RECLAIMABLE,
     MEMINFO_COUNT
 };