Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bb08c030 authored by Mathieu Chartier's avatar Mathieu Chartier Committed by android-build-merger
Browse files

Merge "Fix accounting for .vdex in dumpsys meminfo" 

am: 4a5789b9

Change-Id: I3e50c0e6a80bc221228dd8293ec8209ecf323123
parents 0046acc2 4a5789b9

core/jni/android_os_Debug.cpp

+2 −1
Original line number Diff line number Diff line
@@ -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) {