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

Commit a636a887 authored by Eric Biggers's avatar Eric Biggers Committed by Automerger Merge Worker
Browse files

Merge "init: avoid ERROR log due to missing SEPolicy.zip" into main am: 0306bc1a 

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



Change-Id: I1237548986b9796337a0b426394d5e208777b74f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6471b231 0306bc1a

init/selinux.cpp

+10 −4
Original line number Original line Diff line number Diff line
@@ -667,10 +667,16 @@ void CleanupApexSepolicy() { 
//

//

void PrepareApexSepolicy() {

void PrepareApexSepolicy() {

    // If apex sepolicy zip exists in /metadata/sepolicy, use that, otherwise use version on

    // If apex sepolicy zip exists in /metadata/sepolicy, use that, otherwise use version on

    // /system.

    // /system. If neither exists, do nothing.

    auto dir = (access((kSepolicyApexMetadataDir + kSepolicyZip).c_str(), F_OK) == 0)

    std::string dir;

                       ? kSepolicyApexMetadataDir

    if (access((kSepolicyApexMetadataDir + kSepolicyZip).c_str(), F_OK) == 0) {

                       : kSepolicyApexSystemDir;

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

    auto sepolicyVerify = SepolicyVerify(dir);

    if (!sepolicyVerify.ok()) {

    if (!sepolicyVerify.ok()) {