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

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

Merge "Fix some maps to be HEAP_DALVIK_CODE_CACHE instead of HEAP_DALVIK_ACCOUNTING" into oc-dev 

am: bfd70fb9

Change-Id: I9b8f53db81339493d44a29aa711940a5f0142b67
parents cf274167 bfd70fb9

core/jni/android_os_Debug.cpp

+3 −1
Original line number Diff line number Diff line
@@ -327,7 +327,9 @@ static void read_mapinfo(FILE *fp, stats_t* stats, bool* foundSwapPss) 
                            subHeap = HEAP_DALVIK_ZYGOTE;

                        } else if (strstr(name, "/dev/ashmem/dalvik-indirect ref") == name) {

                            subHeap = HEAP_DALVIK_INDIRECT_REFERENCE_TABLE;

                        } else if (strstr(name, "/dev/ashmem/dalvik-jit-code-cache") == name) {

                        } else if (strstr(name, "/dev/ashmem/dalvik-jit-code-cache") == name ||

                                   strstr(name, "/dev/ashmem/dalvik-data-code-cache") == name ||

                                   strstr(name, "/dev/ashmem/dalvik-CompilerMetadata") == name) {

                            subHeap = HEAP_DALVIK_CODE_CACHE;

                        } else {

                            subHeap = HEAP_DALVIK_ACCOUNTING;  // Default to accounting.