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

Commit 96555a00 authored by Mathieu Chartier's avatar Mathieu Chartier Committed by Android Git Automerger
Browse files

am 8415672e: am 1073f202: am 36c7f4b6: Merge "Add zygote space to Dalvik Heap" 

* commit '8415672e':
  Add zygote space to Dalvik Heap
parents 81b104b3 8415672e

core/jni/android_os_Debug.cpp

+1 −0
Original line number Diff line number Diff line
@@ -274,6 +274,7 @@ static void read_mapinfo(FILE *fp, stats_t* stats) 
                        subHeap = HEAP_DALVIK_LINEARALLOC;

                    } else if ((strstr(name, "/dev/ashmem/dalvik-alloc space") == name) ||

                               (strstr(name, "/dev/ashmem/dalvik-main space") == name) ||

                               (strstr(name, "/dev/ashmem/dalvik-zygote space") == name) ||

                               (strstr(name, "/dev/ashmem/dalvik-non moving space") == name)) {

                        // This is the regular Dalvik heap.

                        whichHeap = HEAP_DALVIK;