diff options
| author | jt1134 <jt1134@gmail.com> | 2012-10-25 20:48:46 -0500 |
|---|---|---|
| committer | Chirayu Desai <cdesai@cyanogenmod.org> | 2013-06-07 08:50:25 +0530 |
| commit | e672fdfefb0f2febfb0312257dd2fe2b09e2d81c (patch) | |
| tree | 61cfb853982ef14bb8cd57de406e0ef979d95d33 | |
| parent | ed53bd05ad30bcbd2243213da8d9e4427b0ac60b (diff) | |
| download | bootable_recovery-e672fdfefb0f2febfb0312257dd2fe2b09e2d81c.zip bootable_recovery-e672fdfefb0f2febfb0312257dd2fe2b09e2d81c.tar.gz bootable_recovery-e672fdfefb0f2febfb0312257dd2fe2b09e2d81c.tar.bz2 | |
move "install zip from sideload" to installation submenu
* Also includes the below commit:
fix installation from internal sdcard
bug introduced in previous commit
Change-Id: If41d409801e9a58df9515ac783bf503f80909d3e
* I've done some minor changes to the original commit,
which includes but is not limited to moving the
"install zip from sideload" above "/sdcard/update.zip".
Signed-off-by: Chirayu Desai <cdesai@cyanogenmod.org>
Change-Id: I27a763a0d41085719a6c7d9c3b8a20fbcae4b072
| -rw-r--r-- | default_recovery_ui.c | 3 | ||||
| -rw-r--r-- | extendedcommands.c | 18 | ||||
| -rw-r--r-- | recovery.c | 6 | ||||
| -rw-r--r-- | recovery_ui.h | 14 |
4 files changed, 21 insertions, 20 deletions
diff --git a/default_recovery_ui.c b/default_recovery_ui.c index 1f801f1..032c1b3 100644 --- a/default_recovery_ui.c +++ b/default_recovery_ui.c @@ -23,8 +23,7 @@ char* MENU_HEADERS[] = { NULL }; char* MENU_ITEMS[] = { "reboot system now", - "install zip from sdcard", - "install zip from sideload", + "install zip", "wipe data/factory reset", "wipe cache partition", "backup and restore", diff --git a/extendedcommands.c b/extendedcommands.c index 3dd4d2a..5b6e52f 100644 --- a/extendedcommands.c +++ b/extendedcommands.c @@ -41,6 +41,7 @@ #include "bmlutils/bmlutils.h" #include "cutils/android_reboot.h" +#include "adb_install.h" int signature_check_enabled = 1; int script_assert_enabled = 1; @@ -119,18 +120,20 @@ int install_zip(const char* packagefilepath) } #define ITEM_CHOOSE_ZIP 0 -#define ITEM_APPLY_UPDATE 1 -#define ITEM_SIG_CHECK 2 -#define ITEM_CHOOSE_ZIP_INT 3 +#define ITEM_APPLY_SIDELOAD 1 +#define ITEM_APPLY_UPDATE 2 // /sdcard/update.zip +#define ITEM_SIG_CHECK 3 +#define ITEM_CHOOSE_ZIP_INT 4 void show_install_update_menu() { - static char* headers[] = { "Apply update from .zip file on SD card", + static char* headers[] = { "Install update from zip file", "", NULL }; char* install_menu_items[] = { "choose zip from sdcard", + "install zip from sideload", "apply /sdcard/update.zip", "toggle signature verification", NULL, @@ -139,11 +142,11 @@ void show_install_update_menu() char *other_sd = NULL; if (volume_for_path("/emmc") != NULL) { other_sd = "/emmc/"; - install_menu_items[3] = "choose zip from internal sdcard"; + install_menu_items[4] = "choose zip from internal sdcard"; } else if (volume_for_path("/external_sd") != NULL) { other_sd = "/external_sd/"; - install_menu_items[3] = "choose zip from external sdcard"; + install_menu_items[4] = "choose zip from external sdcard"; } for (;;) @@ -164,6 +167,9 @@ void show_install_update_menu() show_choose_zip_menu("/sdcard/"); write_recovery_version(); break; + case ITEM_APPLY_SIDELOAD: + apply_from_adb(); + break; case ITEM_CHOOSE_ZIP_INT: if (other_sd != NULL) show_choose_zip_menu(other_sd); @@ -718,14 +718,10 @@ prompt_and_wait() { } break; - case ITEM_APPLY_SDCARD: + case ITEM_APPLY_ZIP: show_install_update_menu(); break; - case ITEM_APPLY_SIDELOAD: - apply_from_adb(); - break; - case ITEM_NANDROID: show_nandroid_menu(); break; diff --git a/recovery_ui.h b/recovery_ui.h index 101e6be..ec88d95 100644 --- a/recovery_ui.h +++ b/recovery_ui.h @@ -75,15 +75,15 @@ int device_wipe_data(); #define ITEM_REBOOT 0 #define ITEM_APPLY_EXT 1 #define ITEM_APPLY_SDCARD 1 // historical synonym for ITEM_APPLY_EXT -#define ITEM_APPLY_SIDELOAD 2 -#define ITEM_WIPE_DATA 3 -#define ITEM_WIPE_CACHE 4 +#define ITEM_APPLY_ZIP 1 // used for installing an update from a zip +#define ITEM_WIPE_DATA 2 +#define ITEM_WIPE_CACHE 3 // unused in cwr #define ITEM_APPLY_CACHE 4 -#define ITEM_NANDROID 5 -#define ITEM_PARTITION 6 -#define ITEM_ADVANCED 7 -#define ITEM_POWEROFF 8 +#define ITEM_NANDROID 4 +#define ITEM_PARTITION 5 +#define ITEM_ADVANCED 6 +#define ITEM_POWEROFF 7 // Header text to display above the main menu. extern char* MENU_HEADERS[]; |