Merge "Account malloc mmaped pages as native heap."

2013-02-22 18:02:40 +00:00
parent 49999acb04 afc10e174d
commit 08a92a335f
1 changed files with 2 additions and 1 deletions
--- a/core/jni/android_os_Debug.cpp
+++ b/core/jni/android_os_Debug.cpp
@@ -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;