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

Commit 51c8c578 authored by Kevin Jeon's avatar Kevin Jeon Committed by Automerger Merge Worker
Browse files

Merge "Update VmaCallbacks to return bool" into main am: 06326980 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2977412



Change-Id: If2e0affcbd250cb827714bafdd7b8591bf67488b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents abd361d9 06326980

core/jni/android_os_Debug.cpp

+1 −0
Original line number Diff line number Diff line
@@ -410,6 +410,7 @@ static bool load_maps(int pid, stats_t* stats, bool* foundSwapPss) 
            stats[sub_heap].swappedOut += usage.swap;

            stats[sub_heap].swappedOutPss += usage.swap_pss;

        }

        return true;

    };



    return meminfo::ForEachVmaFromFile(smaps_path, vma_scan);

services/core/jni/com_android_server_am_CachedAppOptimizer.cpp

+1 −0
Original line number Diff line number Diff line
@@ -393,6 +393,7 @@ static int64_t compactProcess(int pid, VmaToAdviseFunc vmaToAdviseFunc) { 
                ++pageoutVmaIndex;

                break;

        }

        return true;

    };

    meminfo.ForEachVmaFromMaps(vmaCollectorCb, mapsBuffer);

    ATRACE_END();