diff options
| author | Dianne Hackborn <hackbod@google.com> | 2014-12-09 01:53:35 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-12-09 01:53:37 +0000 |
| commit | 8b33cf4d34a9ea75e1121ee2f1d829b21f3cb5d6 (patch) | |
| tree | 6309c2313651a681589d5ed56e36a6b530375af1 /core/java/android | |
| parent | 52070f81f2c4c41ffe74adcabda64c2b0349c62d (diff) | |
| parent | 1a4b5a4f02e7d8ff8ff645377d97e6062d36aeaa (diff) | |
| download | frameworks_base-8b33cf4d34a9ea75e1121ee2f1d829b21f3cb5d6.zip frameworks_base-8b33cf4d34a9ea75e1121ee2f1d829b21f3cb5d6.tar.gz frameworks_base-8b33cf4d34a9ea75e1121ee2f1d829b21f3cb5d6.tar.bz2 | |
Merge "Work on issue #18640385: Add procstats test mode" into lmp-mr1-dev
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/os/Debug.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/core/java/android/os/Debug.java b/core/java/android/os/Debug.java index 7eb606a..a9deaf3 100644 --- a/core/java/android/os/Debug.java +++ b/core/java/android/os/Debug.java @@ -1074,9 +1074,10 @@ href="{@docRoot}guide/developing/tools/traceview.html">Traceview: A Graphical Lo /** * Retrieves the PSS memory used by the process as given by the * smaps. Optionally supply a long array of 1 entry to also - * receive the uss of the process. @hide + * receive the uss of the process, and another array to also + * retrieve the separate memtrack size. @hide */ - public static native long getPss(int pid, long[] outUss); + public static native long getPss(int pid, long[] outUss, long[] outMemtrack); /** @hide */ public static final int MEMINFO_TOTAL = 0; |