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

Commit 92f3e9a1 authored by Ian Rogers's avatar Ian Rogers Committed by Android Git Automerger
Browse files

am e88c0d9e: Merge "Recognize odex files in memory accounting." 

* commit 'e88c0d9e':
  Recognize odex files in memory accounting.
parents 06689433 e88c0d9e

core/jni/android_os_Debug.cpp

+2 −1
Original line number Original line Diff line number Diff line
@@ -178,7 +178,8 @@ static void read_mapinfo(FILE *fp, stats_t* stats) 
                whichHeap = HEAP_APK;

                whichHeap = HEAP_APK;

            } else if (nameLen > 4 && strcmp(name+nameLen-4, ".ttf") == 0) {

            } else if (nameLen > 4 && strcmp(name+nameLen-4, ".ttf") == 0) {

                whichHeap = HEAP_TTF;

                whichHeap = HEAP_TTF;

            } else if (nameLen > 4 && strcmp(name+nameLen-4, ".dex") == 0) {

            } else if ((nameLen > 4 && strcmp(name+nameLen-4, ".dex") == 0) ||

                       (nameLen > 5 && strcmp(name+nameLen-5, ".odex") == 0)) {

                whichHeap = HEAP_DEX;

                whichHeap = HEAP_DEX;

            } else if (nameLen > 0) {

            } else if (nameLen > 0) {

                whichHeap = HEAP_UNKNOWN_MAP;

                whichHeap = HEAP_UNKNOWN_MAP;