summaryrefslogtreecommitdiffstats
path: root/recovery.c
diff options
context:
space:
mode:
authorDoug Zongker <dougz@android.com>2010-02-02 22:09:52 +0100
committerDoug Zongker <dougz@android.com>2010-02-03 18:20:07 +0100
commite08991e02a7d678f2574e85289a34b2a9a537c82 (patch)
treeca53b4adbf66388805a47f93c440412be552761c /recovery.c
parentMerge "change log recovery to generic device_recovery_start function" (diff)
downloadandroid_bootable_recovery-e08991e02a7d678f2574e85289a34b2a9a537c82.tar
android_bootable_recovery-e08991e02a7d678f2574e85289a34b2a9a537c82.tar.gz
android_bootable_recovery-e08991e02a7d678f2574e85289a34b2a9a537c82.tar.bz2
android_bootable_recovery-e08991e02a7d678f2574e85289a34b2a9a537c82.tar.lz
android_bootable_recovery-e08991e02a7d678f2574e85289a34b2a9a537c82.tar.xz
android_bootable_recovery-e08991e02a7d678f2574e85289a34b2a9a537c82.tar.zst
android_bootable_recovery-e08991e02a7d678f2574e85289a34b2a9a537c82.zip
Diffstat (limited to 'recovery.c')
-rw-r--r--recovery.c11
1 files changed, 1 insertions, 10 deletions
diff --git a/recovery.c b/recovery.c
index 73a54a23e..4c437e599 100644
--- a/recovery.c
+++ b/recovery.c
@@ -31,7 +31,6 @@
#include "bootloader.h"
#include "common.h"
#include "cutils/properties.h"
-#include "firmware.h"
#include "install.h"
#include "minui/minui.h"
#include "minzip/DirUtil.h"
@@ -445,12 +444,7 @@ prompt_and_wait() {
} else if (!ui_text_visible()) {
return; // reboot if logs aren't visible
} else {
- if (firmware_update_pending()) {
- ui_print("\nReboot via menu to complete\n"
- "installation.\n");
- } else {
- ui_print("\nInstall from sdcard complete.\n");
- }
+ ui_print("\nInstall from sdcard complete.\n");
}
break;
}
@@ -563,9 +557,6 @@ main(int argc, char **argv) {
if (status != INSTALL_SUCCESS) ui_set_background(BACKGROUND_ICON_ERROR);
if (status != INSTALL_SUCCESS || ui_text_visible()) prompt_and_wait();
- // If there is a radio image pending, reboot now to install it.
- maybe_install_firmware_update(send_intent, TEMPORARY_LOG_FILE);
-
// Otherwise, get ready to boot the main system...
finish_recovery(send_intent);
ui_print("Rebooting...\n");