From 946ebbcc510acee5c166f2945075da65d8ae6ed3 Mon Sep 17 00:00:00 2001 From: Mathieu Chartier Date: Thu, 20 Oct 2016 15:38:55 -0700 Subject: [PATCH] Fix accounting for .vdex in dumpsys meminfo Before it was showing up in "Other mmap" instead. Now it is correctly showing up in ".dex mmap". Bug: 30937355 Test: N6P booting, dumpsys meminfo -d Change-Id: I335dbb77414b395b14259aa7c68068f845a5eca1 --- core/jni/android_os_Debug.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/jni/android_os_Debug.cpp b/core/jni/android_os_Debug.cpp index 2a46edf0ef51f..dd5f7555e7a73 100644 --- a/core/jni/android_os_Debug.cpp +++ b/core/jni/android_os_Debug.cpp @@ -297,7 +297,8 @@ static void read_mapinfo(FILE *fp, stats_t* stats, bool* foundSwapPss) whichHeap = HEAP_TTF; is_swappable = true; } else if ((nameLen > 4 && strstr(name, ".dex") != NULL) || - (nameLen > 5 && strcmp(name+nameLen-5, ".odex") == 0)) { + (nameLen > 5 && strcmp(name+nameLen-5, ".odex") == 0) || + (nameLen > 5 && strcmp(name+nameLen-5, ".vdex") == 0)) { whichHeap = HEAP_DEX; is_swappable = true; } else if (nameLen > 4 && strcmp(name+nameLen-4, ".oat") == 0) {