diff options
| author | Steven Laver <lavers@google.com> | 2019-12-12 15:29:36 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-12-12 15:29:36 +0000 |
| commit | a239544c7b06814b70fd970de7eaac234682fa52 (patch) | |
| tree | a4298d61f9b73642f350799b1157e49b65f4e1e8 /init/builtins.cpp | |
| parent | 63de1e1c8d7824c241f22de67edf54f4f1eaeea5 (diff) | |
| parent | 5319412e5305a3b4bcecf251a2955c09a6e9837e (diff) | |
Merge "Merge RP1A.191203.001" into r-keystone-qcom-dev
Diffstat (limited to 'init/builtins.cpp')
| -rw-r--r-- | init/builtins.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/init/builtins.cpp b/init/builtins.cpp index 8ab1d44c9..8fd2e93ba 100644 --- a/init/builtins.cpp +++ b/init/builtins.cpp @@ -45,6 +45,7 @@ #include <memory> #include <ApexProperties.sysprop.h> +#include <InitProperties.sysprop.h> #include <android-base/chrono_utils.h> #include <android-base/file.h> #include <android-base/logging.h> @@ -1244,7 +1245,9 @@ static Result<void> do_finish_userspace_reboot(const BuiltinArguments&) { boot_clock::time_point now = boot_clock::now(); property_set("sys.init.userspace_reboot.last_finished", std::to_string(now.time_since_epoch().count())); - property_set(kUserspaceRebootInProgress, "0"); + if (!android::sysprop::InitProperties::userspace_reboot_in_progress(false)) { + return Error() << "Failed to set sys.init.userspace_reboot.in_progress property"; + } return {}; } |