summaryrefslogtreecommitdiffstats
path: root/core/java/android/os
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2013-09-13 23:06:07 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-09-13 23:06:07 +0000
commit28eeb42012018bfa3cffc77e9a970e8f5c13f70b (patch)
tree5671d35de432f3ac65092b58299c35ff8a8ab2fa /core/java/android/os
parent78d47240fb71a55897c1ef2e2d06492acbe29ad6 (diff)
parent8e69257a9c7e9c1781e1f53d8856358ada38921d (diff)
downloadframeworks_base-28eeb42012018bfa3cffc77e9a970e8f5c13f70b.zip
frameworks_base-28eeb42012018bfa3cffc77e9a970e8f5c13f70b.tar.gz
frameworks_base-28eeb42012018bfa3cffc77e9a970e8f5c13f70b.tar.bz2
Merge "Implement #10749688: Improve low memory reporting" into klp-dev
Diffstat (limited to 'core/java/android/os')
-rw-r--r--core/java/android/os/Debug.java22
1 files changed, 22 insertions, 0 deletions
diff --git a/core/java/android/os/Debug.java b/core/java/android/os/Debug.java
index 8f68fc1..eb91238 100644
--- a/core/java/android/os/Debug.java
+++ b/core/java/android/os/Debug.java
@@ -1018,6 +1018,28 @@ href="{@docRoot}guide/developing/tools/traceview.html">Traceview: A Graphical Lo
*/
public static native long getPss(int pid, long[] outUss);
+ /** @hide */
+ public static final int MEMINFO_TOTAL = 0;
+ /** @hide */
+ public static final int MEMINFO_FREE = 1;
+ /** @hide */
+ public static final int MEMINFO_BUFFERS = 2;
+ /** @hide */
+ public static final int MEMINFO_CACHED = 3;
+ /** @hide */
+ public static final int MEMINFO_SHMEM = 4;
+ /** @hide */
+ public static final int MEMINFO_SLAB = 5;
+ /** @hide */
+ public static final int MEMINFO_COUNT = 6;
+
+ /**
+ * Retrieves /proc/meminfo. outSizes is filled with fields
+ * as defined by MEMINFO_* offsets.
+ * @hide
+ */
+ public static native void getMemInfo(long[] outSizes);
+
/**
* Establish an object allocation limit in the current thread.
* This feature was never enabled in release builds. The