diff options
| author | Xin Li <delphij@google.com> | 2017-11-14 12:31:11 -0800 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2017-11-14 12:31:11 -0800 |
| commit | 220871a697290529278ed16db508eda8e12f3fc7 (patch) | |
| tree | bc13101b63c6fe39a9d92706ecb7ded7f98f5a9c /core/java/android/os/Debug.java | |
| parent | 802f191b2b84a1b1b82c7f6f3268846084b35dfb (diff) | |
| parent | 98e12851336b7db16e583f9afac63ecc97465980 (diff) | |
Merge commit '98e12851336b7db16e583f9afac63ecc97465980' from
oc-mr1-dev-plus-aosp-without-vendor into stage-aosp-master.
Change-Id: Ia7b8da4a00d215160e4a4fa40f6044208d1297b7
Merged-In: I19846d2a3ee27aecbae2367a74ee49082eea154d
Diffstat (limited to 'core/java/android/os/Debug.java')
| -rw-r--r-- | core/java/android/os/Debug.java | 27 |
1 files changed, 19 insertions, 8 deletions
diff --git a/core/java/android/os/Debug.java b/core/java/android/os/Debug.java index 3286e6ec6ef9..2acf36fed85f 100644 --- a/core/java/android/os/Debug.java +++ b/core/java/android/os/Debug.java @@ -1748,22 +1748,26 @@ public final class Debug public static final int MEMINFO_SHMEM = 4; /** @hide */ public static final int MEMINFO_SLAB = 5; + /** @hide */ + public static final int MEMINFO_SLAB_RECLAIMABLE = 6; + /** @hide */ + public static final int MEMINFO_SLAB_UNRECLAIMABLE = 7; /** @hide */ - public static final int MEMINFO_SWAP_TOTAL = 6; + public static final int MEMINFO_SWAP_TOTAL = 8; /** @hide */ - public static final int MEMINFO_SWAP_FREE = 7; + public static final int MEMINFO_SWAP_FREE = 9; /** @hide */ - public static final int MEMINFO_ZRAM_TOTAL = 8; + public static final int MEMINFO_ZRAM_TOTAL = 10; /** @hide */ - public static final int MEMINFO_MAPPED = 9; + public static final int MEMINFO_MAPPED = 11; /** @hide */ - public static final int MEMINFO_VM_ALLOC_USED = 10; + public static final int MEMINFO_VM_ALLOC_USED = 12; /** @hide */ - public static final int MEMINFO_PAGE_TABLES = 11; + public static final int MEMINFO_PAGE_TABLES = 13; /** @hide */ - public static final int MEMINFO_KERNEL_STACK = 12; + public static final int MEMINFO_KERNEL_STACK = 14; /** @hide */ - public static final int MEMINFO_COUNT = 13; + public static final int MEMINFO_COUNT = 15; /** * Retrieves /proc/meminfo. outSizes is filled with fields @@ -1861,6 +1865,13 @@ public final class Debug public static native void dumpNativeHeap(FileDescriptor fd); /** + * Writes malloc info data to the specified file descriptor. + * + * @hide + */ + public static native void dumpNativeMallocInfo(FileDescriptor fd); + + /** * Returns a count of the extant instances of a class. * * @hide |