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

Commit 177d7338 authored by T.J. Mercier's avatar T.J. Mercier Committed by Android (Google) Code Review
Browse files

Merge "add MEMINFO_SWAP_CACHED in 'cached kernel memory'" into main

parents c6dcaa76 f0622a55

core/java/android/os/Debug.java

+3 −1
Original line number Diff line number Diff line
@@ -2059,7 +2059,9 @@ public final class Debug 
    /** @hide */

    public static final int MEMINFO_CMA_FREE = 25;

    /** @hide */

    public static final int MEMINFO_COUNT = 26;

    public static final int MEMINFO_SWAP_CACHED = 26;

    /** @hide */

    public static final int MEMINFO_COUNT = 27;



    /**

     * Retrieves /proc/meminfo.  outSizes is filled with fields

core/java/com/android/internal/util/MemInfoReader.java

+2 −1
Original line number Diff line number Diff line
@@ -108,7 +108,8 @@ public final class MemInfoReader { 
            kReclaimable = mInfos[Debug.MEMINFO_SLAB_RECLAIMABLE];

        }

        return mInfos[Debug.MEMINFO_BUFFERS] + kReclaimable

                + mInfos[Debug.MEMINFO_CACHED] - mInfos[Debug.MEMINFO_MAPPED];

                + mInfos[Debug.MEMINFO_CACHED] - mInfos[Debug.MEMINFO_MAPPED]

                + mInfos[Debug.MEMINFO_SWAP_CACHED];

    }



    /**

core/jni/android_os_Debug.cpp

+1 −0
Original line number Diff line number Diff line
@@ -406,6 +406,7 @@ enum { 
    MEMINFO_INACTIVE_FILE,

    MEMINFO_CMA_TOTAL,

    MEMINFO_CMA_FREE,

    MEMINFO_SWAP_CACHED,

    MEMINFO_COUNT

};