summaryrefslogtreecommitdiffstats
path: root/updater/install.cpp
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2018-05-04 08:01:13 +0200
committerTao Bao <tbao@google.com>2018-05-04 08:18:38 +0200
commit2c52639d01cb2ff9f0a805e0dda72d39a5487d88 (patch)
treef376f2005a2bc514781e4f94ca176378ab9a9f68 /updater/install.cpp
parentotautil: Rename dir/sys/thermal utils. (diff)
downloadandroid_bootable_recovery-2c52639d01cb2ff9f0a805e0dda72d39a5487d88.tar
android_bootable_recovery-2c52639d01cb2ff9f0a805e0dda72d39a5487d88.tar.gz
android_bootable_recovery-2c52639d01cb2ff9f0a805e0dda72d39a5487d88.tar.bz2
android_bootable_recovery-2c52639d01cb2ff9f0a805e0dda72d39a5487d88.tar.lz
android_bootable_recovery-2c52639d01cb2ff9f0a805e0dda72d39a5487d88.tar.xz
android_bootable_recovery-2c52639d01cb2ff9f0a805e0dda72d39a5487d88.tar.zst
android_bootable_recovery-2c52639d01cb2ff9f0a805e0dda72d39a5487d88.zip
Diffstat (limited to '')
-rw-r--r--updater/install.cpp8
1 files changed, 2 insertions, 6 deletions
diff --git a/updater/install.cpp b/updater/install.cpp
index b41d48c48..bd22467ab 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>
@@ -62,6 +61,7 @@
#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.
@@ -874,11 +874,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);