openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Fix typo in userspace reboot watchdog" 

am: 4ac630b562

Change-Id: I825d646a7f86e17b43b75cd4c422867fb110a6cb
This commit is contained in:
Nikita Ioffe 2019-12-02 10:44:37 -08:00 committed by android-build-merger
parent 903f7bee11 4ac630b562
commit eea98abcb3
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
init/reboot.cpp
View File

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