diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2015-10-19 22:47:45 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-10-19 22:47:45 +0000 |
| commit | 7f2deeeef53887dcad74b8aed86936983353cec4 (patch) | |
| tree | de19f24db207933d855768744179254512c3dde0 /core | |
| parent | e199016a82329b645a86db345c2d39322c8ad03a (diff) | |
| parent | 2e2069d053d43767662953298e7781ffede79fa1 (diff) | |
| download | frameworks_base-7f2deeeef53887dcad74b8aed86936983353cec4.zip frameworks_base-7f2deeeef53887dcad74b8aed86936983353cec4.tar.gz frameworks_base-7f2deeeef53887dcad74b8aed86936983353cec4.tar.bz2 | |
Merge "Fix read_mapinfo to recognize free list large object space" into mnc-dr-dev
Diffstat (limited to 'core')
| -rw-r--r-- | core/jni/android_os_Debug.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/core/jni/android_os_Debug.cpp b/core/jni/android_os_Debug.cpp index e8acd97..9b8243d 100644 --- a/core/jni/android_os_Debug.cpp +++ b/core/jni/android_os_Debug.cpp @@ -309,7 +309,9 @@ static void read_mapinfo(FILE *fp, stats_t* stats) // 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) { |