From 99f628286f42d235f753d6d50bb1bf2a3196341f Mon Sep 17 00:00:00 2001 From: Mathieu Chartier Date: Wed, 19 Nov 2014 13:34:05 -0800 Subject: [PATCH] Add zygote space to Dalvik Heap Broken by https://android-review.googlesource.com/#/c/115446/ This change fixes it by correctly putting the zygote in Dalvik Heap instead of Dalvik Other. Bug: 18447855 (cherry picked from commit 7fc9176c8a2102fb5be3668404bd15feb6878c89) Change-Id: I9293e5d3f55ccfb2c93c6aacbf6abc164eacb10b --- core/jni/android_os_Debug.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/core/jni/android_os_Debug.cpp b/core/jni/android_os_Debug.cpp index e9d16c1620218..92a9eeedf5810 100644 --- a/core/jni/android_os_Debug.cpp +++ b/core/jni/android_os_Debug.cpp @@ -272,6 +272,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;