commit 1c456f667dfbbe91ef90e9bbd1e2381251637f76
author Nikita Ioffe <ioffe@google.com> Mon Dec 02 10:47:00 2019 -0800
committer android-build-merger <android-build-merger@google.com> Mon Dec 02 10:47:00 2019 -0800
tree c83b05a7297dd434123c7928ff30176ed402c23d
parent 4eb7482c4321aaaa57f07ec85b8873ebabb605b1
parent e3bdbabc3c36a9e376a0bb3e5f874c66ca6f08f9

Merge "Fix typo in userspace reboot watchdog" am: 4ac630b562
am: eea98abcb3

Change-Id: I8b870a72fd8b6d87cd3e06be16d94798f4ea680a

init/reboot.cpp

diff --git a/init/reboot.cpp b/init/reboot.cpp
index 13cebcc..c9b521a 100644
--- a/init/reboot.cpp
+++ b/init/reboot.cpp
@@ -806,7 +806,7 @@
 }
 
 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;