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

Commit 17082e04 authored by Anwar Ghuloum's avatar Anwar Ghuloum Committed by Android (Google) Code Review
Browse files

Merge "Break out Oat footprint for ram"

parents 130a27ae 8884ef4f

core/java/android/os/Debug.java

+3 −2
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ public final class Debug 
        public int otherSharedDirty;



        /** @hide */

        public static final int NUM_OTHER_STATS = 10;

        public static final int NUM_OTHER_STATS = 11;



        private int[] otherStats = new int[NUM_OTHER_STATS*3];
@@ -186,7 +186,8 @@ public final class Debug 
                case 6: return ".apk mmap";

                case 7: return ".ttf mmap";

                case 8: return ".dex mmap";

                case 9: return "Other mmap";

                case 9: return ".oat mmap";

                case 10: return "Other mmap";

                default: return "????";

            }

        }

core/jni/android_os_Debug.cpp

+3 −0
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ enum { 
    HEAP_APK,

    HEAP_TTF,

    HEAP_DEX,

    HEAP_OAT,

    HEAP_UNKNOWN_MAP,



    _NUM_HEAP,
@@ -184,6 +185,8 @@ static void read_mapinfo(FILE *fp, stats_t* stats) 
            } else if ((nameLen > 4 && strcmp(name+nameLen-4, ".dex") == 0) ||

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

                whichHeap = HEAP_DEX;

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

                whichHeap = HEAP_OAT;

            } else if (nameLen > 0) {

                whichHeap = HEAP_UNKNOWN_MAP;

            } else if (start == prevEnd && prevHeap == HEAP_SO) {