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

Commit a6358d93 authored by Mathieu Chartier's avatar Mathieu Chartier Committed by android-build-merger
Browse files

Merge "Fix read_mapinfo to recognize free list large object space" into... 

Merge "Fix read_mapinfo to recognize free list large object space" into mnc-dr-dev am: 7f2deeee am: df0cc41a
am: efa447e1

* commit 'efa447e1':
  Fix read_mapinfo to recognize free list large object space
parents 7fdc5d95 efa447e1

core/jni/android_os_Debug.cpp

+3 −1
Original line number Diff line number Diff line
@@ -294,7 +294,9 @@ static void read_mapinfo(FILE *fp, stats_t* stats) 
                            // This is the regular Dalvik heap.

                            whichHeap = HEAP_DALVIK;

                            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;

                            subHeap = HEAP_DALVIK_LARGE;

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