From 2e2069d053d43767662953298e7781ffede79fa1 Mon Sep 17 00:00:00 2001 From: Mathieu Chartier Date: Mon, 19 Oct 2015 13:48:34 -0700 Subject: [PATCH] Fix read_mapinfo to recognize free list large object space Bug: 25081604 (cherry picked from commit 6421da8f46e2a60da55939d8a4f7d91ab286dfcf) Change-Id: If676c2309e3e397676fa8cef21405c34db7d5db2 --- core/jni/android_os_Debug.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/core/jni/android_os_Debug.cpp b/core/jni/android_os_Debug.cpp index e8acd97800873..9b8243d93705a 100644 --- a/core/jni/android_os_Debug.cpp +++ b/core/jni/android_os_Debug.cpp @@ -309,7 +309,9 @@ static void read_mapinfo(FILE *fp, stats_t* stats) // This is the regular Dalvik heap. whichHeap = HEAP_DALVIK; subHeap = HEAP_DALVIK_NORMAL; - } else if (strstr(name, "/dev/ashmem/dalvik-large object space") == name) { + } else if (strstr(name, "/dev/ashmem/dalvik-large object space") == name || + strstr(name, "/dev/ashmem/dalvik-free list large object space") + == name) { whichHeap = HEAP_DALVIK; subHeap = HEAP_DALVIK_LARGE; } else if (strstr(name, "/dev/ashmem/dalvik-non moving space") == name) {