diff options
| author | Suren Baghdasaryan <surenb@google.com> | 2019-12-18 22:03:31 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-12-18 22:03:31 -0800 |
| commit | 215e1d5e2750618ee5336d3cdee029c158f0590a (patch) | |
| tree | 49f7d6f5bb68103242c34e3eaf76892964c7c5a9 /core/java/android | |
| parent | b2384e4850bab28984890f6a03d2742e84c0e7e4 (diff) | |
| parent | f61d2347c05bdc948d9662e7a40710a871a3d6bb (diff) | |
Merge "Include KReclaimable meminfo field into getMemInfo results"
am: f61d2347c0
Change-Id: I9ee7de7b744100409475e7401a6ddede1c1cdbad
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/os/Debug.java | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/core/java/android/os/Debug.java b/core/java/android/os/Debug.java index 4ed7b17d1549..bf26a41c536a 100644 --- a/core/java/android/os/Debug.java +++ b/core/java/android/os/Debug.java @@ -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 |