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

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

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

Change-Id: I7004b874afc98754cdbc9f1d9c5a96b5746aeb75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Bart Van Assche 2022-10-20 17:06:01 +00:00 • committed by Automerger Merge Worker
commit efe3c9fb86
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
init/init.cpp
View file

@ -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;
}
}