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

Commit 73f0dfd4 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "init: apexd is started in the current mount namespace" am: 778f2b68... 

Merge "init: apexd is started in the current mount namespace" am: 778f2b68 am: fe5f60d0 am: d61e073a

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

Change-Id: I6150bf4b982075fc578eec644bd5c0214d0209f1
parents 10a8cac7 d61e073a

init/service.cpp

+5 −1
Original line number Diff line number Diff line
@@ -460,7 +460,11 @@ Result<void> Service::Start() { 
        scon = *result;

    }



    if (!IsDefaultMountNamespaceReady() && name_ != "apexd") {

    // APEXd is always started in the "current" namespace because it is the process to set up

    // the current namespace.

    const bool is_apexd = args_[0] == "/system/bin/apexd";



    if (!IsDefaultMountNamespaceReady() && !is_apexd) {

        // If this service is started before APEXes and corresponding linker configuration

        // get available, mark it as pre-apexd one. Note that this marking is

        // permanent. So for example, if the service is re-launched (e.g., due