diff options
| author | Ian Rogers <irogers@google.com> | 2013-02-27 20:09:25 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-02-27 20:09:25 +0000 |
| commit | 7e112d51c4d203e4e3b2b875dc7c8457e1d9e056 (patch) | |
| tree | 60870b9d19657b370cdacb46ac9a01b0c8605148 /core/java/android/os | |
| parent | 7ff28ad2d1b049d90591aea24656b586ee867e83 (diff) | |
| parent | 14d0ab55e983d314128bb7b3293023f4a237d991 (diff) | |
| download | frameworks_base-7e112d51c4d203e4e3b2b875dc7c8457e1d9e056.zip frameworks_base-7e112d51c4d203e4e3b2b875dc7c8457e1d9e056.tar.gz frameworks_base-7e112d51c4d203e4e3b2b875dc7c8457e1d9e056.tar.bz2 | |
am 14d0ab55: am de3c20bc: Merge "Track stack memory in MemoryInfo."
* commit '14d0ab55e983d314128bb7b3293023f4a237d991':
Track stack memory in MemoryInfo.
Diffstat (limited to 'core/java/android/os')
| -rw-r--r-- | core/java/android/os/Debug.java | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/core/java/android/os/Debug.java b/core/java/android/os/Debug.java index 88ebdd5..2e77237 100644 --- a/core/java/android/os/Debug.java +++ b/core/java/android/os/Debug.java @@ -130,7 +130,7 @@ public final class Debug public int otherSharedDirty; /** @hide */ - public static final int NUM_OTHER_STATS = 9; + public static final int NUM_OTHER_STATS = 10; private int[] otherStats = new int[NUM_OTHER_STATS*3]; @@ -177,15 +177,16 @@ public final class Debug /* @hide */ public static String getOtherLabel(int which) { switch (which) { - case 0: return "Cursor"; - case 1: return "Ashmem"; - case 2: return "Other dev"; - case 3: return ".so mmap"; - case 4: return ".jar mmap"; - case 5: return ".apk mmap"; - case 6: return ".ttf mmap"; - case 7: return ".dex mmap"; - case 8: return "Other mmap"; + case 0: return "Stack"; + case 1: return "Cursor"; + case 2: return "Ashmem"; + case 3: return "Other dev"; + case 4: return ".so mmap"; + case 5: return ".jar mmap"; + case 6: return ".apk mmap"; + case 7: return ".ttf mmap"; + case 8: return ".dex mmap"; + case 9: return "Other mmap"; default: return "????"; } } |