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

Commit a52ce58d authored by Tom Cherry's avatar Tom Cherry Committed by android-build-merger
Browse files

Merge changes Ibe91fd2d,I59e2bd9e am: b0a14f8f am: 4ba72d9b 

am: 9ef76bdc

Change-Id: I49823a29c3f9aaee75ca1d6d2bd092ed2cddd3f4
parents 81898b6f 9ef76bdc

init/service.cpp

+3 −2
Original line number Diff line number Diff line
@@ -634,7 +634,6 @@ bool Service::Start() { 
    if (!seclabel_.empty()) {

        scon = seclabel_;

    } else {

        LOG(INFO) << "computing context for service '" << name_ << "'";

        scon = ComputeContextFromExecutable(name_, args_[0]);

        if (scon == "") {

            return false;
@@ -926,7 +925,9 @@ Service* ServiceManager::MakeExecOneshotService(const std::vector<std::string>& 
    std::vector<std::string> str_args(args.begin() + command_arg, args.end());



    exec_count_++;

    std::string name = StringPrintf("exec %d (%s)", exec_count_, str_args[0].c_str());

    std::string name =

        "exec " + std::to_string(exec_count_) + " (" + android::base::Join(str_args, " ") + ")";



    unsigned flags = SVC_EXEC | SVC_ONESHOT | SVC_TEMPORARY;

    CapSet no_capabilities;

    unsigned namespace_flags = 0;