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

Commit 215e1d5e authored by Suren Baghdasaryan's avatar Suren Baghdasaryan Committed by android-build-merger
Browse files

Merge "Include KReclaimable meminfo field into getMemInfo results" 

am: f61d2347

Change-Id: I9ee7de7b744100409475e7401a6ddede1c1cdbad
parents b2384e48 f61d2347

core/java/android/os/Debug.java

+7 −1
Original line number Diff line number Diff line
@@ -1874,8 +1874,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

core/jni/android_os_Debug.cpp

+1 −0
Original line number Diff line number Diff line
@@ -560,6 +560,7 @@ enum { 
    MEMINFO_VMALLOC_USED,

    MEMINFO_PAGE_TABLES,

    MEMINFO_KERNEL_STACK,

    MEMINFO_KERNEL_RECLAIMABLE,

    MEMINFO_COUNT

};