Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix read_mapinfo to recognize free list large object space" into mnc-dr-dev

Browse Source
This commit is contained in:
Mathieu Chartier
2015-10-19 22:47:45 +00:00
committed by Android (Google) Code Review
parent e199016a82 2e2069d053
commit 7f2deeeef5
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/jni/android_os_Debug.cpp
View File

@@ -309,7 +309,9 @@ static void read_mapinfo(FILE *fp, stats_t* stats)
// This is the regular Dalvik heap. // This is the regular Dalvik heap.
whichHeap = HEAP_DALVIK; whichHeap = HEAP_DALVIK;
subHeap = HEAP_DALVIK_NORMAL; 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; whichHeap = HEAP_DALVIK;
subHeap = HEAP_DALVIK_LARGE; subHeap = HEAP_DALVIK_LARGE;
} else if (strstr(name, "/dev/ashmem/dalvik-non moving space") == name) { } else if (strstr(name, "/dev/ashmem/dalvik-non moving space") == name) {