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

Commit 3b827e10 authored by Ryan Prichard's avatar Ryan Prichard Committed by android-build-merger
Browse files

Merge "Categorize [anon:stack_and_tls:{}] as stack memory" into stage-aosp-master am: 4657a164 

am: 6c05510d

Change-Id: Ibe8bb89f39082f73f3a4e7bdcf34ebdf5dc2f2b6
parents 0fd34eb4 6c05510d

core/jni/android_os_Debug.cpp

+2 −0
Original line number Diff line number Diff line
@@ -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;