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

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

Merge "init: Improve readability of the code in SecondStageMain()" am:... 

Merge "init: Improve readability of the code in SecondStageMain()" am: 5c7dc409 am: efe3c9fb am: b70c05eb

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



Change-Id: Idcf3bb984e9053d703ab39d090c11ce2d3e38ee5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a3a1074b b70c05eb

init/init.cpp

+2 −2
Original line number Diff line number Diff line
@@ -1148,7 +1148,7 @@ int SecondStageMain(int argc, char** argv) { 
    setpriority(PRIO_PROCESS, 0, 0);

    while (true) {

        // By default, sleep until something happens.

        auto epoll_timeout = std::optional<std::chrono::milliseconds>{kDiagnosticTimeout};

        std::chrono::milliseconds epoll_timeout{kDiagnosticTimeout};



        auto shutdown_command = shutdown_state.CheckShutdown();

        if (shutdown_command) {
@@ -1168,7 +1168,7 @@ int SecondStageMain(int argc, char** argv) { 
            if (next_process_action_time) {

                epoll_timeout = std::chrono::ceil<std::chrono::milliseconds>(

                        *next_process_action_time - boot_clock::now());

                if (*epoll_timeout < 0ms) epoll_timeout = 0ms;

                if (epoll_timeout < 0ms) epoll_timeout = 0ms;

            }

        }