Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix issue #10461477: KLP API Review: Debug.MemoryInfo" into klp-dev

Browse Source
This commit is contained in:
Dianne Hackborn
2013-09-14 00:22:06 +00:00
committed by Android (Google) Code Review
parent fff175aedc 3fa8969021
commit 76adfd71f1
2 changed files with 8 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
api/current.txt
View File

@@ -17901,13 +17901,6 @@ package android.os {
public static class Debug.MemoryInfo implements android.os.Parcelable { public static class Debug.MemoryInfo implements android.os.Parcelable {
ctor public Debug.MemoryInfo(); ctor public Debug.MemoryInfo();
method public int describeContents(); method public int describeContents();
method public static java.lang.String getOtherLabel(int);
method public int getOtherPrivateClean(int);
method public int getOtherPrivateDirty(int);
method public int getOtherPss(int);
method public int getOtherSharedClean(int);
method public int getOtherSharedDirty(int);
method public int getOtherSwappablePss(int);
method public int getTotalPrivateClean(); method public int getTotalPrivateClean();
method public int getTotalPrivateDirty(); method public int getTotalPrivateDirty();
method public int getTotalPss(); method public int getTotalPss();

16
core/java/android/os/Debug.java
View File

@@ -236,40 +236,40 @@ public final class Debug
return dalvikSharedClean + nativeSharedClean + otherSharedClean; return dalvikSharedClean + nativeSharedClean + otherSharedClean;
} }
/* @hide */ /** @hide */
public int getOtherPss(int which) { public int getOtherPss(int which) {
return otherStats[which*NUM_CATEGORIES + offsetPss]; return otherStats[which*NUM_CATEGORIES + offsetPss];
} }
/* @hide */ /** @hide */
public int getOtherSwappablePss(int which) { public int getOtherSwappablePss(int which) {
return otherStats[which*NUM_CATEGORIES + offsetSwappablePss]; return otherStats[which*NUM_CATEGORIES + offsetSwappablePss];
} }
/* @hide */ /** @hide */
public int getOtherPrivateDirty(int which) { public int getOtherPrivateDirty(int which) {
return otherStats[which*NUM_CATEGORIES + offsetPrivateDirty]; return otherStats[which*NUM_CATEGORIES + offsetPrivateDirty];
} }
/* @hide */ /** @hide */
public int getOtherSharedDirty(int which) { public int getOtherSharedDirty(int which) {
return otherStats[which*NUM_CATEGORIES + offsetSharedDirty]; return otherStats[which*NUM_CATEGORIES + offsetSharedDirty];
} }
/* @hide */ /** @hide */
public int getOtherPrivateClean(int which) { public int getOtherPrivateClean(int which) {
return otherStats[which*NUM_CATEGORIES + offsetPrivateClean]; return otherStats[which*NUM_CATEGORIES + offsetPrivateClean];
} }
/* @hide */ /** @hide */
public int getOtherSharedClean(int which) { public int getOtherSharedClean(int which) {
return otherStats[which*NUM_CATEGORIES + offsetSharedClean]; return otherStats[which*NUM_CATEGORIES + offsetSharedClean];
} }
/* @hide */ /** @hide */
public static String getOtherLabel(int which) { public static String getOtherLabel(int which) {
switch (which) { switch (which) {
case 0: return "Dalvik Other"; 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. * Clears the global size of objects allocated.
* @see #getGlobalAllocCountSize() * @see #getGlobalAllocSize()
*/ */
public static void resetGlobalAllocSize() { public static void resetGlobalAllocSize() {
VMDebug.resetAllocCount(VMDebug.KIND_GLOBAL_ALLOCATED_BYTES); VMDebug.resetAllocCount(VMDebug.KIND_GLOBAL_ALLOCATED_BYTES);