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

am 08a92a33: Merge "Account malloc mmaped pages as native heap."

Browse Source 
* commit '08a92a335fd84ca427b55c6c2d39f72970d82b76':
  Account malloc mmaped pages as native heap.
This commit is contained in:
Ian Rogers
2013-02-22 10:53:59 -08:00
committed by Android Git Automerger
parent 531a599660 08a92a335f
commit 631bc614f5
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/jni/android_os_Debug.cpp
View File

@@ -159,7 +159,8 @@ static void read_mapinfo(FILE *fp, stats_t* stats)
name = line + name_pos;
nameLen = strlen(name);
if (strstr(name, "[heap]") == name) {
if ((strstr(name, "[heap]") == name) ||
(strstr(name, "/dev/ashmem/libc malloc") == name)) {
whichHeap = HEAP_NATIVE;
} else if (strstr(name, "/dev/ashmem/dalvik-") == name) {
whichHeap = HEAP_DALVIK;