Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Trim " (deleted)" from map names" into nyc-dev am: 7aa090e793

Browse Source 
am: bfe8dc96fa

* commit 'bfe8dc96fa08b30eda6494bdb0020835320565ff':
  Trim " (deleted)" from map names
This commit is contained in:
Mathieu Chartier
2016-03-03 21:43:59 +00:00
committed by android-build-merger
parent 08dc8c0432 bfe8dc96fa
commit 125ffaf533
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/jni/android_os_Debug.cpp
View File

@@ -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) {