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

Commit ed95756f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Avoid unnecessary smaps logic during app compaction" into sc-dev am: b28ad521 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I34482b7acf1773c51c4aa6b46a8566d637574c72
parents 21467670 b28ad521

services/core/jni/com_android_server_am_CachedAppOptimizer.cpp

+2 −2
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ static int getAnyPageAdvice(const Vma& vma) { 
static int compactProcess(int pid, VmaToAdviseFunc vmaToAdviseFunc) {

    ProcMemInfo meminfo(pid);

    std::vector<Vma> pageoutVmas, coldVmas;

    auto vmaCollectorCb = [&](Vma vma) {

    auto vmaCollectorCb = [&coldVmas,&pageoutVmas,&vmaToAdviseFunc](const Vma& vma) {

        int advice = vmaToAdviseFunc(vma);

        switch (advice) {

            case MADV_COLD:
@@ -146,7 +146,7 @@ static int compactProcess(int pid, VmaToAdviseFunc vmaToAdviseFunc) { 
                break;

        }

    };

    meminfo.ForEachVma(vmaCollectorCb);

    meminfo.ForEachVmaFromMaps(vmaCollectorCb);



    int err = compactMemory(pageoutVmas, pid, MADV_PAGEOUT);

    if (!err) {