summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Ryan Prichard <rprichard@google.com> 2019-07-23 19:35:36 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2019-07-23 19:35:36 +0000
commit94ea77fb0090e4761d4d8766824ff20f9160539c (patch)
tree85fd39a67c4d1052c7a86294b78b68e820dd2c13
parent2ae2175178d24a4707d25a316d16f3e2b793fd09 (diff)
parent2a632a3880b152c478e147a41c5e011dee2c2a52 (diff)
Merge "Categorize [anon:stack_and_tls:{}] as stack memory"
-rw-r--r--core/jni/android_os_Debug.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/core/jni/android_os_Debug.cpp b/core/jni/android_os_Debug.cpp
index c3e7a36bef78..13e1dfa00160 100644
--- a/core/jni/android_os_Debug.cpp
+++ b/core/jni/android_os_Debug.cpp
@@ -259,6 +259,8 @@ static void load_maps(int pid, stats_t* stats, bool* foundSwapPss)
which_heap = HEAP_NATIVE;
} else if (base::StartsWith(name, "[stack")) {
which_heap = HEAP_STACK;
+ } else if (base::StartsWith(name, "[anon:stack_and_tls:")) {
+ which_heap = HEAP_STACK;
} else if (base::EndsWith(name, ".so")) {
which_heap = HEAP_SO;
is_swappable = true;