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

Commit ace3b4b7 authored by Edgar Arriaga's avatar Edgar Arriaga Committed by Automerger Merge Worker
Browse files

Avoid unnecessary smaps logic during app compaction am: 3536bf7b 

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

Change-Id: I589e0fc4fb0377d03b1cccc0d0da55f799f2571f
parents 84f86940 3536bf7b

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) {