Merge "Fix accounting for .vdex in dumpsys meminfo"

am: 4a5789b9b1

Change-Id: I3e50c0e6a80bc221228dd8293ec8209ecf323123
This commit is contained in:
Mathieu Chartier
2016-10-21 17:20:27 +00:00
committed by android-build-merger

View File

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