summaryrefslogtreecommitdiffstats
path: root/updater
diff options
context:
space:
mode:
authorandroid-build-prod (mdb) <android-build-team-robot@google.com>2018-05-04 19:38:41 +0200
committerandroid-build-merger <android-build-merger@google.com>2018-05-04 19:38:41 +0200
commitc4ba6b738f053b4503ff1232d594d7d135e71531 (patch)
treef376f2005a2bc514781e4f94ca176378ab9a9f68 /updater
parentMerge "otautil: Only build the needed files for host build." (diff)
parentMerge changes I1cc5d702,I32ab9854 (diff)
downloadandroid_bootable_recovery-c4ba6b738f053b4503ff1232d594d7d135e71531.tar
android_bootable_recovery-c4ba6b738f053b4503ff1232d594d7d135e71531.tar.gz
android_bootable_recovery-c4ba6b738f053b4503ff1232d594d7d135e71531.tar.bz2
android_bootable_recovery-c4ba6b738f053b4503ff1232d594d7d135e71531.tar.lz
android_bootable_recovery-c4ba6b738f053b4503ff1232d594d7d135e71531.tar.xz
android_bootable_recovery-c4ba6b738f053b4503ff1232d594d7d135e71531.tar.zst
android_bootable_recovery-c4ba6b738f053b4503ff1232d594d7d135e71531.zip
Diffstat (limited to 'updater')
-rw-r--r--updater/install.cpp10
-rw-r--r--updater/updater.cpp4
2 files changed, 5 insertions, 9 deletions
diff --git a/updater/install.cpp b/updater/install.cpp
index 5623c3379..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>
@@ -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.
@@ -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);
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"