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

Commit 95b77d1f authored by Oli Lan's avatar Oli Lan Committed by android-build-merger
Browse files

Merge "Change ownership of apex data directories to root." 

am: 93125768

Change-Id: Icba57e2e3c5fc813b1d2f66da0e1551c06394b5c
parents 22ad80da 93125768

init/builtins.cpp

+2 −3
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ 
#include <fscrypt/fscrypt.h>

#include <libgsi/libgsi.h>

#include <logwrap/logwrap.h>

#include <private/android_filesystem_config.h>

#include <selinux/android.h>

#include <selinux/label.h>

#include <selinux/selinux.h>
@@ -1266,9 +1267,7 @@ static Result<void> create_apex_data_dirs() { 
        if (strchr(name, '@') != nullptr) continue;



        auto path = "/data/misc/apexdata/" + std::string(name);

        auto system_uid = DecodeUid("system");

        auto options =

                MkdirOptions{path, 0700, *system_uid, *system_uid, FscryptAction::kNone, "ref"};

        auto options = MkdirOptions{path, 0770, AID_ROOT, AID_SYSTEM, FscryptAction::kNone, "ref"};

        make_dir_with_options(options);

    }

    return {};