summaryrefslogtreecommitdiffstats
path: root/recovery_main.cpp
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2019-04-29 20:23:16 +0200
committerTao Bao <tbao@google.com>2019-04-29 21:12:25 +0200
commit782dcc1996f6b39ef9e085d7153c2f109ff2609a (patch)
tree25c89a6308fc456aacbbf883517247ae2af517c2 /recovery_main.cpp
parentMerge "Support wipe command in rescue mode" (diff)
downloadandroid_bootable_recovery-782dcc1996f6b39ef9e085d7153c2f109ff2609a.tar
android_bootable_recovery-782dcc1996f6b39ef9e085d7153c2f109ff2609a.tar.gz
android_bootable_recovery-782dcc1996f6b39ef9e085d7153c2f109ff2609a.tar.bz2
android_bootable_recovery-782dcc1996f6b39ef9e085d7153c2f109ff2609a.tar.lz
android_bootable_recovery-782dcc1996f6b39ef9e085d7153c2f109ff2609a.tar.xz
android_bootable_recovery-782dcc1996f6b39ef9e085d7153c2f109ff2609a.tar.zst
android_bootable_recovery-782dcc1996f6b39ef9e085d7153c2f109ff2609a.zip
Diffstat (limited to 'recovery_main.cpp')
-rw-r--r--recovery_main.cpp18
1 files changed, 8 insertions, 10 deletions
diff --git a/recovery_main.cpp b/recovery_main.cpp
index 6e69b7009..b999505fb 100644
--- a/recovery_main.cpp
+++ b/recovery_main.cpp
@@ -41,7 +41,6 @@
#include <android-base/strings.h>
#include <android-base/unique_fd.h>
#include <bootloader_message/bootloader_message.h>
-#include <cutils/android_reboot.h>
#include <cutils/sockets.h>
#include <private/android_logger.h> /* private pmsg functions */
#include <selinux/android.h>
@@ -471,27 +470,26 @@ int main(int argc, char** argv) {
switch (ret) {
case Device::SHUTDOWN:
ui->Print("Shutting down...\n");
- // TODO: Move all the reboots to reboot(), which should conditionally set quiescent flag.
- android::base::SetProperty(ANDROID_RB_PROPERTY, "shutdown,");
+ Shutdown();
break;
case Device::REBOOT_BOOTLOADER:
ui->Print("Rebooting to bootloader...\n");
- android::base::SetProperty(ANDROID_RB_PROPERTY, "reboot,bootloader");
+ Reboot("bootloader");
break;
case Device::REBOOT_FASTBOOT:
ui->Print("Rebooting to recovery/fastboot...\n");
- android::base::SetProperty(ANDROID_RB_PROPERTY, "reboot,fastboot");
+ Reboot("fastboot");
break;
case Device::REBOOT_RECOVERY:
ui->Print("Rebooting to recovery...\n");
- reboot("reboot,recovery");
+ Reboot("recovery");
break;
case Device::REBOOT_RESCUE: {
- // Not using `reboot("reboot,rescue")`, as it requires matching support in kernel and/or
+ // Not using `Reboot("rescue")`, as it requires matching support in kernel and/or
// bootloader.
bootloader_message boot = {};
strlcpy(boot.command, "boot-rescue", sizeof(boot.command));
@@ -502,14 +500,14 @@ int main(int argc, char** argv) {
continue;
}
ui->Print("Rebooting to recovery/rescue...\n");
- reboot("reboot,recovery");
+ Reboot("recovery");
break;
}
case Device::ENTER_FASTBOOT:
if (logical_partitions_mapped()) {
ui->Print("Partitions may be mounted - rebooting to enter fastboot.");
- android::base::SetProperty(ANDROID_RB_PROPERTY, "reboot,fastboot");
+ Reboot("fastboot");
} else {
LOG(INFO) << "Entering fastboot";
fastboot = true;
@@ -523,7 +521,7 @@ int main(int argc, char** argv) {
default:
ui->Print("Rebooting...\n");
- reboot("reboot,");
+ Reboot("");
break;
}
}