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

Commit 7aa090e7 authored by Mathieu Chartier's avatar Mathieu Chartier Committed by Android (Google) Code Review
Browse files

Merge "Trim " (deleted)" from map names" into nyc-dev

parents ebdc198e d47cbea8

core/jni/android_os_Debug.cpp

+7 −1
Original line number Diff line number Diff line
@@ -262,7 +262,13 @@ static void read_mapinfo(FILE *fp, stats_t* stats, bool* foundSwapPss) 
            }

            name = line + name_pos;

            nameLen = strlen(name);



            // Trim the end of the line if it is " (deleted)".

            const char* deleted_str = " (deleted)";

            if (nameLen > (int)strlen(deleted_str) &&

                strcmp(name+nameLen-strlen(deleted_str), deleted_str) == 0) {

                nameLen -= strlen(deleted_str);

                name[nameLen] = '\0';

            }

            if ((strstr(name, "[heap]") == name)) {

                whichHeap = HEAP_NATIVE;

            } else if (strncmp(name, "[anon:libc_malloc]", 18) == 0) {