From 6421da8f46e2a60da55939d8a4f7d91ab286dfcf 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 Change-Id: Ie277fd964afcdc80b97432cbd611a8136a2059d7 --- 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 097bbac84e3f8..1ee7ea8f7ea6c 100644 --- a/core/jni/android_os_Debug.cpp +++ b/core/jni/android_os_Debug.cpp @@ -294,7 +294,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) {