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

Commit 706a898c authored by Nick Kralevich's avatar Nick Kralevich Committed by android-build-merger
Browse files

Merge "Clarify SELinux service error message" 

am: 54a28300

Change-Id: I638bad81212c20b1c0065eab98ab2e043b643aac
parents 2bf9cbf2 54a28300

init/service.cpp

+5 −1
Original line number Diff line number Diff line
@@ -82,7 +82,11 @@ static Result<std::string> ComputeContextFromExecutable(std::string& service_nam 
        free(new_con);

    }

    if (rc == 0 && computed_context == mycon.get()) {

        return Error() << "Service does not have an SELinux domain defined";

        return Error() << "File " << service_path << "(labeled \"" << filecon.get()

                       << "\") has incorrect label or no domain transition from " << mycon.get()

                       << " to another SELinux domain defined. Have you configured your "

                          "service correctly? https://source.android.com/security/selinux/"

                          "device-policy#label_new_services_and_address_denials";

    }

    if (rc < 0) {

        return Error() << "Could not get process context";