Merge "init: avoid ERROR log due to missing SEPolicy.zip" into main (0306bc1a) · Commits · e / os / android_system_core

init/selinux.cpp

+10 −4

Original line number	Diff line number	Diff line
		@@ -667,10 +667,16 @@ void CleanupApexSepolicy() {
		//
		void PrepareApexSepolicy() {
		// If apex sepolicy zip exists in /metadata/sepolicy, use that, otherwise use version on
		// /system.
		auto dir = (access((kSepolicyApexMetadataDir + kSepolicyZip).c_str(), F_OK) == 0)
		? kSepolicyApexMetadataDir
		: kSepolicyApexSystemDir;
		// /system. If neither exists, do nothing.
		std::string dir;
		if (access((kSepolicyApexMetadataDir + kSepolicyZip).c_str(), F_OK) == 0) {
		dir = kSepolicyApexMetadataDir;
		} else if (access((kSepolicyApexSystemDir + kSepolicyZip).c_str(), F_OK) == 0) {
		dir = kSepolicyApexSystemDir;
		} else {
		LOG(INFO) << "APEX Sepolicy not found";
		return;
		}

		auto sepolicyVerify = SepolicyVerify(dir);
		if (!sepolicyVerify.ok()) {