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

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

Merge "break out boot.art"

parents 17082e04 88887d0a

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 = 11;

        public static final int NUM_OTHER_STATS = 12;



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

                case 8: return ".dex mmap";

                case 9: return ".oat mmap";

                case 10: return "Other mmap";

                case 10: return ".art mmap";

                case 11: return "Other mmap";

                default: return "????";

            }

        }

core/jni/android_os_Debug.cpp

+3 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ enum { 
    HEAP_TTF,

    HEAP_DEX,

    HEAP_OAT,

    HEAP_ART,

    HEAP_UNKNOWN_MAP,



    _NUM_HEAP,
@@ -187,6 +188,8 @@ static void read_mapinfo(FILE *fp, stats_t* stats) 
                whichHeap = HEAP_DEX;

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

                whichHeap = HEAP_OAT;

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

                whichHeap = HEAP_ART;

            } else if (nameLen > 0) {

                whichHeap = HEAP_UNKNOWN_MAP;

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