From 5a347195dfb08efb4b2deef7aa5b2740da4abc9e Mon Sep 17 00:00:00 2001
From: Ryan Prichard <rprichard@google.com>
Date: Mon, 17 Jun 2019 17:58:46 -0700
Subject: [PATCH] Categorize [anon:stack_and_tls:{}] as stack memory

Bug: http://b/134795155
Test: run "dumpsys meminfo" and verify that this CL increases the reported
  stack memory usage
Change-Id: Id929671d6c52ba92b4ea11c83297f3af3ced89e4
Merged-In: Id929671d6c52ba92b4ea11c83297f3af3ced89e4
---
 core/jni/android_os_Debug.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/core/jni/android_os_Debug.cpp b/core/jni/android_os_Debug.cpp
index 62c4d76ed4550..bbd8ffe686a8f 100644
--- a/core/jni/android_os_Debug.cpp
+++ b/core/jni/android_os_Debug.cpp
@@ -306,6 +306,8 @@ static void read_mapinfo(FILE *fp, stats_t* stats, bool* foundSwapPss)
                 whichHeap = HEAP_NATIVE;
             } else if (strncmp(name, "[stack", 6) == 0) {
                 whichHeap = HEAP_STACK;
+            } else if (strncmp(name, "[anon:stack_and_tls:", 20) == 0) {
+                whichHeap = HEAP_STACK;
             } else if (nameLen > 3 && strcmp(name+nameLen-3, ".so") == 0) {
                 whichHeap = HEAP_SO;
                 is_swappable = true;