commit 59d548e1e54fa753d3776647b98dc34ea7c27685
author Mathieu Chartier <mathieuc@google.com> Mon Oct 19 22:36:40 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Oct 19 22:36:40 2015 +0000
tree 0d93ce170a6caf320c429e7e4f3b7d6815057621
parent 75693994f60bdec9a10db98ddb8addd2bc3f8bbb
parent 6421da8f46e2a60da55939d8a4f7d91ab286dfcf

Merge "Fix read_mapinfo to recognize free list large object space"

core/jni/android_os_Debug.cpp

diff --git a/core/jni/android_os_Debug.cpp b/core/jni/android_os_Debug.cpp
index 097bbac..1ee7ea8 100644
--- a/core/jni/android_os_Debug.cpp
+++ b/core/jni/android_os_Debug.cpp
@@ -294,7 +294,9 @@
                             // 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) {