Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix some bugs in dumpsys meminfo attribution" into qt-dev

Browse Source
This commit is contained in:
Mathieu Chartier
2019-06-05 00:22:39 +00:00
committed by Android (Google) Code Review
parent 0906e02aa3 8da8cbfefc
commit 652b445c07
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/jni/android_os_Debug.cpp
View File

@@ -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/")) {