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

Commit 6813b3c8 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 am: bb08c030 

am: f822d0bc

Change-Id: I28189f4d70c6b76e25db5e318855f3512755969e
parents 3c46e092 f822d0bc

core/jni/android_os_Debug.cpp

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