summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Mathieu Chartier <mathieuc@google.com> 2015-10-19 13:48:34 -0700
committer Mathieu Chartier <mathieuc@google.com> 2015-10-19 15:22:06 -0700
commit6421da8f46e2a60da55939d8a4f7d91ab286dfcf (patch)
tree0d93ce170a6caf320c429e7e4f3b7d6815057621
parent75693994f60bdec9a10db98ddb8addd2bc3f8bbb (diff)
Fix read_mapinfo to recognize free list large object space
Bug: 25081604 Change-Id: Ie277fd964afcdc80b97432cbd611a8136a2059d7
-rw-r--r--core/jni/android_os_Debug.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/core/jni/android_os_Debug.cpp b/core/jni/android_os_Debug.cpp
index 097bbac84e3f..1ee7ea8f7ea6 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) {