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

2 files changed, 8 insertions, 15 deletions

diff --git a/api/current.txt b/api/current.txt
index fab32e8..10f8c36 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -17901,13 +17901,6 @@ package android.os {
   public static class Debug.MemoryInfo implements android.os.Parcelable {
     ctor public Debug.MemoryInfo();
     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 getTotalPrivateDirty();
     method public int getTotalPss();
diff --git a/core/java/android/os/Debug.java b/core/java/android/os/Debug.java
index eb91238..0c718f4 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);