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

Commit eea98abc authored by Nikita Ioffe's avatar Nikita Ioffe Committed by android-build-merger
Browse files

Merge "Fix typo in userspace reboot watchdog" 

am: 4ac630b5

Change-Id: I825d646a7f86e17b43b75cd4c422867fb110a6cb
parents 903f7bee 4ac630b5

init/reboot.cpp

+1 −1
Original line number Diff line number Diff line
@@ -806,7 +806,7 @@ static Result<void> DoUserspaceReboot() { 
}



static void UserspaceRebootWatchdogThread() {

    if (!WaitForProperty("sys.init.userspace_reboot_in_progress", "1", 20s)) {

    if (!WaitForProperty("sys.init.userspace_reboot.in_progress", "1", 20s)) {

        // TODO(b/135984674): should we reboot instead?

        LOG(WARNING) << "Userspace reboot didn't start in 20 seconds. Stopping watchdog";

        return;