summaryrefslogtreecommitdiffstats
path: root/recovery.cpp
diff options
context:
space:
mode:
authorHridya Valsaraju <hridya@google.com>2018-07-28 07:09:12 +0200
committerHridya Valsaraju <hridya@google.com>2018-08-14 06:18:18 +0200
commit20c81b308d834f84f3decf795575dc7a0baeb69d (patch)
tree259f985023b38c976208d7fa8e95a59fdf9b615d /recovery.cpp
parentMerge "Reland "Build and use minadbd as a shared library."" (diff)
downloadandroid_bootable_recovery-20c81b308d834f84f3decf795575dc7a0baeb69d.tar
android_bootable_recovery-20c81b308d834f84f3decf795575dc7a0baeb69d.tar.gz
android_bootable_recovery-20c81b308d834f84f3decf795575dc7a0baeb69d.tar.bz2
android_bootable_recovery-20c81b308d834f84f3decf795575dc7a0baeb69d.tar.lz
android_bootable_recovery-20c81b308d834f84f3decf795575dc7a0baeb69d.tar.xz
android_bootable_recovery-20c81b308d834f84f3decf795575dc7a0baeb69d.tar.zst
android_bootable_recovery-20c81b308d834f84f3decf795575dc7a0baeb69d.zip
Diffstat (limited to '')
-rw-r--r--recovery.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/recovery.cpp b/recovery.cpp
index cc30035df..24f105da0 100644
--- a/recovery.cpp
+++ b/recovery.cpp
@@ -779,6 +779,8 @@ static Device::BuiltinAction prompt_and_wait(Device* device, int status) {
case Device::REBOOT:
case Device::SHUTDOWN:
case Device::REBOOT_BOOTLOADER:
+ case Device::ENTER_FASTBOOT:
+ case Device::ENTER_RECOVERY:
return chosen_action;
case Device::WIPE_DATA:
@@ -1006,6 +1008,7 @@ static void log_failure_code(ErrorCode code, const std::string& update_package)
Device::BuiltinAction start_recovery(Device* device, const std::vector<std::string>& args) {
static constexpr struct option OPTIONS[] = {
+ { "fastboot", no_argument, nullptr, 0 },
{ "fsck_unshare_blocks", no_argument, nullptr, 0 },
{ "just_exit", no_argument, nullptr, 'x' },
{ "locale", required_argument, nullptr, 0 },
@@ -1060,7 +1063,7 @@ Device::BuiltinAction start_recovery(Device* device, const std::vector<std::stri
std::string option = OPTIONS[option_index].name;
if (option == "fsck_unshare_blocks") {
fsck_unshare_blocks = true;
- } else if (option == "locale") {
+ } else if (option == "locale" || option == "fastboot") {
// Handled in recovery_main.cpp
} else if (option == "prompt_and_wipe_data") {
should_prompt_and_wipe_data = true;