Merge "Fix stack memory accounting for dumpsys" into qt-dev

am: cfc26842d3 Change-Id: I2c85a611604632bb90f90b6ed90982d7de07ff02
2019-05-31 14:00:05 -07:00
parent 7318ecbdcf cfc26842d3
commit a0f296a290
1 changed files with 1 additions and 1 deletions
--- a/core/jni/android_os_Debug.cpp
+++ b/core/jni/android_os_Debug.cpp
@@ -258,7 +258,7 @@ static void load_maps(int pid, stats_t* stats, bool* foundSwapPss)
        } else if (base::StartsWith(name, "[anon:libc_malloc]")) {
            which_heap = HEAP_NATIVE;
        } else if (base::StartsWith(name, "[stack")) {
-            which_heap = HEAP_NATIVE;
+            which_heap = HEAP_STACK;
        } else if (base::EndsWith(name, ".so")) {
            which_heap = HEAP_SO;
            is_swappable = true;