ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

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

Change-Id: I89a5b7dbd3b1f856463f2404fce99ed3d739c3d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Bart Van Assche 2023-03-06 19:11:36 +00:00 • committed by Automerger Merge Worker
commit 9d1a3f7cd2
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
init/init.cpp
View file

@ -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())) {