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

Commit f1e8c9c0 authored by Bart Van Assche's avatar Bart Van Assche Committed by Automerger Merge Worker
Browse files

Merge "init: Introduce RequiresConsole()" am: f2934de9 am: 22ac02c5 

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



Change-Id: I71b077a3d38eb448be965d3f6aa824774969eaf7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1209f5c8 22ac02c5

init/service_utils.cpp

+1 −1
Original line number Diff line number Diff line
@@ -240,7 +240,7 @@ Result<void> SetProcessAttributes(const ProcessAttributes& attr) { 
        }

    }



    if (!attr.console.empty()) {

    if (RequiresConsole(attr)) {

        setsid();

        OpenConsole(attr.console);

    } else {

init/service_utils.h

+5 −0
Original line number Diff line number Diff line
@@ -95,6 +95,11 @@ struct ProcessAttributes { 
    int priority;

    bool stdio_to_kmsg;

};



inline bool RequiresConsole(const ProcessAttributes& attr) {

    return !attr.console.empty();

}



Result<void> SetProcessAttributes(const ProcessAttributes& attr);



Result<void> WritePidToFiles(std::vector<std::string>* files);