Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 631bc614 authored by Ian Rogers's avatar Ian Rogers Committed by Android Git Automerger
Browse files

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

* commit '08a92a33':
  Account malloc mmaped pages as native heap.
parents 531a5996 08a92a33

core/jni/android_os_Debug.cpp

+2 −1
Original line number Diff line number Diff line
@@ -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;