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

Commit d1f1ea76 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android (Google) Code Review
Browse files

Merge "Few more small meminfo improvements." into lmp-mr1-dev

parents 99a6c1cb 18429307

core/java/android/os/Debug.java

+19 −18
Original line number Diff line number Diff line
@@ -165,7 +165,7 @@ public final class Debug 
        public int otherSwappedOut;



        /** @hide */

        public static final int NUM_OTHER_STATS = 16;

        public static final int NUM_OTHER_STATS = 17;



        /** @hide */

        public static final int NUM_DVK_STATS = 5;
@@ -296,23 +296,24 @@ public final class Debug 
                case 1: return "Stack";

                case 2: return "Cursor";

                case 3: return "Ashmem";

                case 4: return "Other dev";

                case 5: return ".so mmap";

                case 6: return ".jar mmap";

                case 7: return ".apk mmap";

                case 8: return ".ttf mmap";

                case 9: return ".dex mmap";

                case 10: return "code mmap";

                case 11: return "image mmap";

                case 12: return "Other mmap";

                case 13: return "Graphics";

                case 14: return "GL";

                case 15: return "Memtrack";

                case 16: return ".Heap";

                case 17: return ".LOS";

                case 18: return ".LinearAlloc";

                case 19: return ".GC";

                case 20: return ".JITCache";

                case 4: return "Gfx driver";

                case 5: return "Other dev";

                case 6: return ".so mmap";

                case 7: return ".jar mmap";

                case 8: return ".apk mmap";

                case 9: return ".ttf mmap";

                case 10: return ".dex mmap";

                case 11: return ".oat mmap";

                case 12: return ".art mmap";

                case 13: return "Other mmap";

                case 14: return "Graphics";

                case 15: return "GL";

                case 16: return "Memtrack";

                case 17: return ".Heap";

                case 18: return ".LOS";

                case 19: return ".LinearAlloc";

                case 20: return ".GC";

                case 21: return ".JITCache";

                default: return "????";

            }

        }

core/jni/android_os_Debug.cpp

+7 −1
Original line number Diff line number Diff line
@@ -46,10 +46,12 @@ enum { 
    HEAP_UNKNOWN,

    HEAP_DALVIK,

    HEAP_NATIVE,



    HEAP_DALVIK_OTHER,

    HEAP_STACK,

    HEAP_CURSOR,

    HEAP_ASHMEM,

    HEAP_GL_DEV,

    HEAP_UNKNOWN_DEV,

    HEAP_SO,

    HEAP_JAR,
@@ -297,7 +299,11 @@ static void read_mapinfo(FILE *fp, stats_t* stats) 
            } else if (strncmp(name, "[stack", 6) == 0) {

                whichHeap = HEAP_STACK;

            } else if (strncmp(name, "/dev/", 5) == 0) {

                if (strncmp(name, "/dev/kgsl-3d0", 13) == 0) {

                    whichHeap = HEAP_GL_DEV;

                } else {

                    whichHeap = HEAP_UNKNOWN_DEV;

                }

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

                whichHeap = HEAP_SO;

                is_swappable = true;