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

Commit 47a8e0ec authored by Mathieu Chartier's avatar Mathieu Chartier Committed by android-build-merger
Browse files

Merge "Fix some bugs in dumpsys meminfo attribution" into qt-dev am: 652b445c 

am: 63b02d86

Change-Id: I53051ed553218f7ff4a0c5a790131ea8376c3019
parents 788d3662 63b02d86

core/jni/android_os_Debug.cpp

+3 −3
Original line number Original line Diff line number Diff line
@@ -289,14 +289,14 @@ static void load_maps(int pid, stats_t* stats, bool* foundSwapPss) 
        } else if (base::EndsWith(name, ".oat")) {

        } else if (base::EndsWith(name, ".oat")) {

            which_heap = HEAP_OAT;

            which_heap = HEAP_OAT;

            is_swappable = true;

            is_swappable = true;

        } else if (base::EndsWith(name, ".art")) {

        } else if (base::EndsWith(name, ".art") || base::EndsWith(name, ".art]")) {

            which_heap = HEAP_ART;

            which_heap = HEAP_ART;

            // Handle system@framework@boot* and system/framework/boot*

            // Handle system@framework@boot* and system/framework/boot*

            if ((strstr(name.c_str(), "@boot") != nullptr) ||

            if ((strstr(name.c_str(), "@boot") != nullptr) ||

                    (strstr(name.c_str(), "/boot"))) {

                    (strstr(name.c_str(), "/boot"))) {

                sub_heap = HEAP_DEX_BOOT_VDEX;

                sub_heap = HEAP_ART_BOOT;

            } else {

            } else {

                sub_heap = HEAP_DEX_APP_VDEX;

                sub_heap = HEAP_ART_APP;

            }

            }

            is_swappable = true;

            is_swappable = true;

        } else if (base::StartsWith(name, "/dev/")) {

        } else if (base::StartsWith(name, "/dev/")) {