diff options
| -rw-r--r-- | core/java/android/os/Debug.java | 5 | ||||
| -rw-r--r-- | core/jni/android_os_Debug.cpp | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/core/java/android/os/Debug.java b/core/java/android/os/Debug.java index fd01da9f8afa..1557644897a6 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 = 10; + public static final int NUM_OTHER_STATS = 11; private int[] otherStats = new int[NUM_OTHER_STATS*3]; @@ -186,7 +186,8 @@ public final class Debug case 6: return ".apk mmap"; case 7: return ".ttf mmap"; case 8: return ".dex mmap"; - case 9: return "Other mmap"; + case 9: return ".oat mmap"; + case 10: return "Other mmap"; default: return "????"; } } diff --git a/core/jni/android_os_Debug.cpp b/core/jni/android_os_Debug.cpp index 2883c102dada..1e6d53af20b5 100644 --- a/core/jni/android_os_Debug.cpp +++ b/core/jni/android_os_Debug.cpp @@ -52,6 +52,7 @@ enum { HEAP_APK, HEAP_TTF, HEAP_DEX, + HEAP_OAT, HEAP_UNKNOWN_MAP, _NUM_HEAP, @@ -184,6 +185,8 @@ static void read_mapinfo(FILE *fp, stats_t* stats) } else if ((nameLen > 4 && strcmp(name+nameLen-4, ".dex") == 0) || (nameLen > 5 && strcmp(name+nameLen-5, ".odex") == 0)) { whichHeap = HEAP_DEX; + } else if (nameLen > 4 && strcmp(name+nameLen-4, ".oat") == 0) { + whichHeap = HEAP_OAT; } else if (nameLen > 0) { whichHeap = HEAP_UNKNOWN_MAP; } else if (start == prevEnd && prevHeap == HEAP_SO) { |