diff options
| author | 2017-04-11 23:59:28 +0000 | |
|---|---|---|
| committer | 2017-04-11 23:59:30 +0000 | |
| commit | d269f30d62d9ea142790736c7509bb3b5637a38c (patch) | |
| tree | 889dff9e8f58105cba33127dd742e0f37515c75f | |
| parent | cf39eea407efc9cd9196cecd042d91a07b4bfcce (diff) | |
| parent | 1886a155f21ea33b71ed76871eb22cdb6a3dbe3f (diff) | |
Merge "Fix some maps to be HEAP_DALVIK_CODE_CACHE instead of HEAP_DALVIK_ACCOUNTING"
| -rw-r--r-- | core/jni/android_os_Debug.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/core/jni/android_os_Debug.cpp b/core/jni/android_os_Debug.cpp index a75848973b06..68a085191067 100644 --- a/core/jni/android_os_Debug.cpp +++ b/core/jni/android_os_Debug.cpp @@ -333,7 +333,9 @@ static void read_mapinfo(FILE *fp, stats_t* stats, bool* foundSwapPss) subHeap = HEAP_DALVIK_ZYGOTE; } else if (strstr(name, "/dev/ashmem/dalvik-indirect ref") == name) { subHeap = HEAP_DALVIK_INDIRECT_REFERENCE_TABLE; - } else if (strstr(name, "/dev/ashmem/dalvik-jit-code-cache") == name) { + } else if (strstr(name, "/dev/ashmem/dalvik-jit-code-cache") == name || + strstr(name, "/dev/ashmem/dalvik-data-code-cache") == name || + strstr(name, "/dev/ashmem/dalvik-CompilerMetadata") == name) { subHeap = HEAP_DALVIK_CODE_CACHE; } else { subHeap = HEAP_DALVIK_ACCOUNTING; // Default to accounting. |