diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2019-12-19 06:22:00 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2019-12-19 06:22:00 +0000 |
| commit | d23e6f7b09ebd65c6b42df1a5387f470b484742a (patch) | |
| tree | d8f10973db96abf9ef7792bcc0fc1c7e90eca3ba /core/java/android/os/Debug.java | |
| parent | 5faef1b60ade7c519dffb9a0ebcdde421ab685b1 (diff) | |
| parent | 215e1d5e2750618ee5336d3cdee029c158f0590a (diff) | |
Merge "Include KReclaimable meminfo field into getMemInfo results" am: f61d2347c0 am: 215e1d5e27
Change-Id: I7a5b775b93ce3c345d376b4c2e9dfa6ebde31848
Diffstat (limited to 'core/java/android/os/Debug.java')
| -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 |