diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2015-10-19 13:48:34 -0700 |
|---|---|---|
| committer | Mathieu Chartier <mathieuc@google.com> | 2015-10-19 15:44:26 -0700 |
| commit | 2e2069d053d43767662953298e7781ffede79fa1 (patch) | |
| tree | 30a932cd36b72ca8a9adc4c81cf83d5b2f5a37f1 /core/jni | |
| parent | a817c90a7ab296473345b0e106acc9be4e5b678c (diff) | |
| download | frameworks_base-2e2069d053d43767662953298e7781ffede79fa1.zip frameworks_base-2e2069d053d43767662953298e7781ffede79fa1.tar.gz frameworks_base-2e2069d053d43767662953298e7781ffede79fa1.tar.bz2 | |
Fix read_mapinfo to recognize free list large object space
Bug: 25081604
(cherry picked from commit 6421da8f46e2a60da55939d8a4f7d91ab286dfcf)
Change-Id: If676c2309e3e397676fa8cef21405c34db7d5db2
Diffstat (limited to 'core/jni')
| -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) { |