am 1073f202: am 36c7f4b6: Merge "Add zygote space to Dalvik Heap"

* commit '1073f2023efcc6cbd099358677d3e87ee996486d': Add zygote space to Dalvik Heap
2014-11-19 22:09:29 +00:00
parent b85b969b60 1073f2023e
commit 8415672e18
1 changed files with 1 additions and 0 deletions
--- a/core/jni/android_os_Debug.cpp
+++ b/core/jni/android_os_Debug.cpp
@@ -274,6 +274,7 @@ static void read_mapinfo(FILE *fp, stats_t* stats)
                        subHeap = HEAP_DALVIK_LINEARALLOC;
                    } else if ((strstr(name, "/dev/ashmem/dalvik-alloc space") == name) ||
                               (strstr(name, "/dev/ashmem/dalvik-main space") == name) ||
+                               (strstr(name, "/dev/ashmem/dalvik-zygote space") == name) ||
                               (strstr(name, "/dev/ashmem/dalvik-non moving space") == name)) {
                        // This is the regular Dalvik heap.
                        whichHeap = HEAP_DALVIK;