diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2019-12-19 06:38:58 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2019-12-19 06:38:58 +0000 |
| commit | 1f5d183deff10c4dc557af68d3aa61fc0f26c587 (patch) | |
| tree | 7c4634ac2c3a3f914b620187c4a0943752ffbe1c /core/java/android/os/Debug.java | |
| parent | c314813f998438cca12c4c234de5c7c2345836f3 (diff) | |
| parent | d23e6f7b09ebd65c6b42df1a5387f470b484742a (diff) | |
Merge "Include KReclaimable meminfo field into getMemInfo results" am: f61d2347c0 am: 215e1d5e27 am: d23e6f7b09
Change-Id: I3d0f27c2ca0471af8058b86a7d1510cd246fda87
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 563492925ff0..e34b5238aee5 100644 --- a/core/java/android/os/Debug.java +++ b/core/java/android/os/Debug.java @@ -1938,8 +1938,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 |