diff options
| author | 2016-10-21 17:07:37 +0000 | |
|---|---|---|
| committer | 2016-10-21 17:07:37 +0000 | |
| commit | 4a5789b9b102e683fc2da7d56a4a43e57d0cd32e (patch) | |
| tree | 318e8375dba4acd32caf1f1fa650f489db3e74dc | |
| parent | e6fe836938324f8a9a98958f2ffe501ec724c91b (diff) | |
| parent | 946ebbcc510acee5c166f2945075da65d8ae6ed3 (diff) | |
Merge "Fix accounting for .vdex in dumpsys meminfo"
| -rw-r--r-- | core/jni/android_os_Debug.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/jni/android_os_Debug.cpp b/core/jni/android_os_Debug.cpp index 2a46edf0ef51..dd5f7555e7a7 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) { |