diff options
| author | android-build-prod (mdb) <android-build-team-robot@google.com> | 2018-05-04 19:43:36 +0200 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-05-04 19:43:36 +0200 |
| commit | 13415d9138556586281f032c4f84d329c9f2cb77 (patch) | |
| tree | d1ca1805b021c8e7c19d33f0ccbc50d65f7a488a /updater | |
| parent | Merge "otautil: Only build the needed files for host build." am: 5818e894df (diff) | |
| parent | Merge changes I1cc5d702,I32ab9854 (diff) | |
| download | android_bootable_recovery-13415d9138556586281f032c4f84d329c9f2cb77.tar android_bootable_recovery-13415d9138556586281f032c4f84d329c9f2cb77.tar.gz android_bootable_recovery-13415d9138556586281f032c4f84d329c9f2cb77.tar.bz2 android_bootable_recovery-13415d9138556586281f032c4f84d329c9f2cb77.tar.lz android_bootable_recovery-13415d9138556586281f032c4f84d329c9f2cb77.tar.xz android_bootable_recovery-13415d9138556586281f032c4f84d329c9f2cb77.tar.zst android_bootable_recovery-13415d9138556586281f032c4f84d329c9f2cb77.zip | |
Diffstat (limited to 'updater')
| -rw-r--r-- | updater/install.cpp | 10 | ||||
| -rw-r--r-- | updater/updater.cpp | 4 |
2 files changed, 5 insertions, 9 deletions
diff --git a/updater/install.cpp b/updater/install.cpp index 9f40fc524..dfd2dc3ae 100644 --- a/updater/install.cpp +++ b/updater/install.cpp @@ -48,7 +48,6 @@ #include <android-base/strings.h> #include <applypatch/applypatch.h> #include <bootloader_message/bootloader_message.h> -#include <cutils/android_reboot.h> #include <ext4_utils/wipe.h> #include <openssl/sha.h> #include <selinux/label.h> @@ -58,10 +57,11 @@ #include "edify/expr.h" #include "otafault/ota_io.h" -#include "otautil/DirUtil.h" +#include "otautil/dirutil.h" #include "otautil/error_code.h" #include "otautil/mounts.h" #include "otautil/print_sha1.h" +#include "otautil/sysutil.h" #include "updater/updater.h" // Send over the buffer to recovery though the command pipe. @@ -872,11 +872,7 @@ Value* RebootNowFn(const char* name, State* state, const std::vector<std::unique return StringValue(""); } - std::string reboot_cmd = "reboot," + property; - if (android::base::GetBoolProperty("ro.boot.quiescent", false)) { - reboot_cmd += ",quiescent"; - } - android::base::SetProperty(ANDROID_RB_PROPERTY, reboot_cmd); + reboot("reboot," + property); sleep(5); return ErrorAbort(state, kRebootFailure, "%s() failed to reboot", name); diff --git a/updater/updater.cpp b/updater/updater.cpp index bf7c36caf..40e3f1fc1 100644 --- a/updater/updater.cpp +++ b/updater/updater.cpp @@ -32,9 +32,9 @@ #include "edify/expr.h" #include "otafault/config.h" -#include "otautil/DirUtil.h" -#include "otautil/SysUtil.h" +#include "otautil/dirutil.h" #include "otautil/error_code.h" +#include "otautil/sysutil.h" #include "updater/blockimg.h" #include "updater/install.h" |