diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2014-11-19 13:34:05 -0800 |
|---|---|---|
| committer | Mathieu Chartier <mathieuc@google.com> | 2014-11-19 13:54:00 -0800 |
| commit | 99f628286f42d235f753d6d50bb1bf2a3196341f (patch) | |
| tree | 27a0008e95177980e8e924dc141bc33662b58d9e | |
| parent | c3507d1098a444176a7270cba7e5299af7f77350 (diff) | |
| download | frameworks_base-99f628286f42d235f753d6d50bb1bf2a3196341f.zip frameworks_base-99f628286f42d235f753d6d50bb1bf2a3196341f.tar.gz frameworks_base-99f628286f42d235f753d6d50bb1bf2a3196341f.tar.bz2 | |
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
| -rw-r--r-- | core/jni/android_os_Debug.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/core/jni/android_os_Debug.cpp b/core/jni/android_os_Debug.cpp index e9d16c1..92a9eee 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; |