diff --git a/install/install.cpp b/install/install.cpp index 979616dcff07069bbb63d4fcd3321ae73d047180..6c62975b606c76e37ab5165d09b08a1bfeeeb952 100644 --- a/install/install.cpp +++ b/install/install.cpp @@ -63,7 +63,6 @@ using namespace std::chrono_literals; -bool ask_to_ab_reboot(Device* device); bool ask_to_continue_unverified(Device* device); bool ask_to_continue_downgrade(Device* device); @@ -385,21 +384,6 @@ static InstallResult TryUpdateBinary(Package* package, bool* wipe_cache, return INSTALL_ERROR; } - const auto reboot_to_recovery = [] { - if (std::string err; !clear_bootloader_message(&err)) { - LOG(ERROR) << "Failed to clear BCB message: " << err; - } - Reboot("recovery"); - }; - - static bool ab_package_installed = false; - if (ab_package_installed) { - if (ask_to_ab_reboot(device)) { - reboot_to_recovery(); - } - return INSTALL_ERROR; - } - if (package_is_ab) { CHECK(package->GetType() == PackageType::kFile); } @@ -585,11 +569,7 @@ static InstallResult TryUpdateBinary(Package* package, bool* wipe_cache, LOG(FATAL) << "Invalid status code " << status; } if (package_is_ab) { - ab_package_installed = true; PerformPowerwashIfRequired(zip, device); - if (!ui->IsSideloadAutoReboot() && ask_to_ab_reboot(device)) { - reboot_to_recovery(); - } } return INSTALL_SUCCESS; diff --git a/recovery.cpp b/recovery.cpp index 929ef43b5bae91f8e9ffff22562db890c192465d..b56a81f0b79278dfe57bbbbecbd1d57aa16f683b 100644 --- a/recovery.cpp +++ b/recovery.cpp @@ -175,12 +175,6 @@ static bool yes_no(Device* device, const char* question1, const char* question2) return (chosen_item == 1); } -bool ask_to_ab_reboot(Device* device) { - device->GetUI()->SetProgressType(RecoveryUI::EMPTY); - return yes_no(device, "To install additional packages, you need to reboot recovery first", - "Do you want to reboot to recovery now?"); -} - bool ask_to_continue_unverified(Device* device) { if (get_build_type() == "user") { return false;