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

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

Merge "init: Combine the CheckShutdown() and set_do_shutdown() methods" am: 42908c45 

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



Change-Id: I387ff39f41579a1c61ba8f51d067652262313950
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f00d7fd0 42908c45

init/init.cpp

+2 −4
Original line number Diff line number Diff line
@@ -247,16 +247,15 @@ static class ShutdownState { 
        WakeMainInitThread();

    }



    std::optional<std::string> CheckShutdown() {

    std::optional<std::string> CheckShutdown() __attribute__((warn_unused_result)) {

        auto lock = std::lock_guard{shutdown_command_lock_};

        if (do_shutdown_ && !IsShuttingDown()) {

            do_shutdown_ = false;

            return shutdown_command_;

        }

        return {};

    }



    void set_do_shutdown(bool value) { do_shutdown_ = value; }



  private:

    std::mutex shutdown_command_lock_;

    std::string shutdown_command_ GUARDED_BY(shutdown_command_lock_);
@@ -1094,7 +1093,6 @@ int SecondStageMain(int argc, char** argv) { 
            LOG(INFO) << "Got shutdown_command '" << *shutdown_command

                      << "' Calling HandlePowerctlMessage()";

            HandlePowerctlMessage(*shutdown_command);

            shutdown_state.set_do_shutdown(false);

        }



        if (!(prop_waiter_state.MightBeWaiting() || Service::is_exec_service_running())) {