diff options
| author | Dianne Hackborn <hackbod@google.com> | 2013-09-14 00:22:06 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-09-14 00:22:06 +0000 |
| commit | 76adfd71f1ebdf50a03c85e2a7c87d5691f81b13 (patch) | |
| tree | ccc014fa91fbb423c149a150b4e314df3c44922c /core/java/android | |
| parent | fff175aedc86a176fb6ceafe00fe5a26adc5d909 (diff) | |
| parent | 3fa8969021793cf75f95540742cac04e6893488e (diff) | |
Merge "Fix issue #10461477: KLP API Review: Debug.MemoryInfo" into klp-dev
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/os/Debug.java | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/core/java/android/os/Debug.java b/core/java/android/os/Debug.java index eb91238451e7..0c718f4d93a7 100644 --- a/core/java/android/os/Debug.java +++ b/core/java/android/os/Debug.java @@ -236,40 +236,40 @@ public final class Debug return dalvikSharedClean + nativeSharedClean + otherSharedClean; } - /* @hide */ + /** @hide */ public int getOtherPss(int which) { return otherStats[which*NUM_CATEGORIES + offsetPss]; } - /* @hide */ + /** @hide */ public int getOtherSwappablePss(int which) { return otherStats[which*NUM_CATEGORIES + offsetSwappablePss]; } - /* @hide */ + /** @hide */ public int getOtherPrivateDirty(int which) { return otherStats[which*NUM_CATEGORIES + offsetPrivateDirty]; } - /* @hide */ + /** @hide */ public int getOtherSharedDirty(int which) { return otherStats[which*NUM_CATEGORIES + offsetSharedDirty]; } - /* @hide */ + /** @hide */ public int getOtherPrivateClean(int which) { return otherStats[which*NUM_CATEGORIES + offsetPrivateClean]; } - /* @hide */ + /** @hide */ public int getOtherSharedClean(int which) { return otherStats[which*NUM_CATEGORIES + offsetSharedClean]; } - /* @hide */ + /** @hide */ public static String getOtherLabel(int which) { switch (which) { case 0: return "Dalvik Other"; @@ -733,7 +733,7 @@ href="{@docRoot}guide/developing/tools/traceview.html">Traceview: A Graphical Lo /** * Clears the global size of objects allocated. - * @see #getGlobalAllocCountSize() + * @see #getGlobalAllocSize() */ public static void resetGlobalAllocSize() { VMDebug.resetAllocCount(VMDebug.KIND_GLOBAL_ALLOCATED_BYTES); |