Snap for 8680934 from ac9d440fd066d0a6ca4c881e5a6b11ec114d7268 to tm-qpr1-release (7edf6f6a) · Commits · e / os / android_system_core

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 {