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

Commit 099ffa2f authored by Wei Wang's avatar Wei Wang Committed by android-build-merger
Browse files

Merge "init: set oom_adj early before fork vendor_init" 

am: a7c103eb

Change-Id: Ic46fc421933d240231d0c6cea2cb454c677f3fc0
parents ff460d7f a7c103eb

init/init.cpp

+5 −0
Original line number Diff line number Diff line
@@ -630,6 +630,11 @@ int SecondStageMain(int argc, char** argv) { 
    InitKernelLogging(argv, InitAborter);

    LOG(INFO) << "init second stage started!";



    // Set init and its forked children's oom_adj.

    if (auto result = WriteFile("/proc/1/oom_score_adj", "-1000"); !result) {

        LOG(ERROR) << "Unable to write -1000 to /proc/1/oom_score_adj: " << result.error();

    }



    // Enable seccomp if global boot option was passed (otherwise it is enabled in zygote).

    GlobalSeccomp();

rootdir/init.rc

+0 −3
Original line number Diff line number Diff line
@@ -13,9 +13,6 @@ import /init.${ro.zygote}.rc 


# Cgroups are mounted right before early-init using list from /etc/cgroups.json

on early-init

    # Set init and its forked children's oom_adj.

    write /proc/1/oom_score_adj -1000



    # Disable sysrq from keyboard

    write /proc/sys/kernel/sysrq 0