From d47cbea81cbc3a986ebf511c73d39fb9b6d2634c Mon Sep 17 00:00:00 2001 From: Mathieu Chartier Date: Thu, 3 Mar 2016 10:59:33 -0800 Subject: [PATCH] Trim " (deleted)" from map names Fixes application images to show as .art instead of GC accounting. This was caused by storing the image in an anonymous map. Bug: 27471334 Change-Id: I1a9584ab56cd7674df3832304886c743dafee731 --- core/jni/android_os_Debug.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/core/jni/android_os_Debug.cpp b/core/jni/android_os_Debug.cpp index 3df0876532cbd..f870a891b0946 100644 --- a/core/jni/android_os_Debug.cpp +++ b/core/jni/android_os_Debug.cpp @@ -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) {