diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2014-11-19 21:58:17 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-11-19 21:58:17 +0000 |
| commit | 36c7f4b67326bad547f16aa6e72140bd839ab28d (patch) | |
| tree | 1548649fc22555016e4d18abc74d4c2acc796328 /core | |
| parent | 1228e58e88ac0ae2abb698ed3f933ac44a8851ee (diff) | |
| parent | 99f628286f42d235f753d6d50bb1bf2a3196341f (diff) | |
| download | frameworks_base-36c7f4b67326bad547f16aa6e72140bd839ab28d.zip frameworks_base-36c7f4b67326bad547f16aa6e72140bd839ab28d.tar.gz frameworks_base-36c7f4b67326bad547f16aa6e72140bd839ab28d.tar.bz2 | |
Merge "Add zygote space to Dalvik Heap"
Diffstat (limited to 'core')
| -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; |