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

Commit cff39e7d authored by Akilesh Kailash's avatar Akilesh Kailash Committed by Automerger Merge Worker
Browse files

Merge "init: Set oom_score_adj to snapuserd process" am: cb3ef68f am: 1aae2b57 am: 6e01fe95 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2114498



Change-Id: I6d1178b9b8d57882cffb7f2f4f5971e164fcd1ba
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 28505419 6e01fe95

init/snapuserd_transition.cpp

+10 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
#include <android-base/file.h>

#include <android-base/logging.h>

#include <android-base/parseint.h>

#include <android-base/stringprintf.h>

#include <android-base/strings.h>

#include <android-base/unique_fd.h>

#include <cutils/sockets.h>
@@ -40,6 +41,7 @@ 
#include <snapuserd/snapuserd_client.h>



#include "block_dev_initializer.h"

#include "lmkd_service.h"

#include "service_utils.h"

#include "util.h"
@@ -320,6 +322,14 @@ void SnapuserdSelinuxHelper::RelaunchFirstStageSnapuserd() { 


        LOG(INFO) << "Relaunched snapuserd with pid: " << pid;



        // Since daemon is not started as a service, we have

        // to explicitly set the OOM score to default which is unkillable

        std::string oom_str = std::to_string(DEFAULT_OOM_SCORE_ADJUST);

        std::string oom_file = android::base::StringPrintf("/proc/%d/oom_score_adj", pid);

        if (!android::base::WriteStringToFile(oom_str, oom_file)) {

            PLOG(ERROR) << "couldn't write oom_score_adj to snapuserd daemon with pid: " << pid;

        }



        if (!TestSnapuserdIsReady()) {

            PLOG(FATAL) << "snapuserd daemon failed to launch";

        } else {