aboutsummaryrefslogtreecommitdiffstats
path: root/extendedcommands.c
diff options
context:
space:
mode:
authorjt1134 <jt1134@gmail.com>2012-10-25 20:48:46 -0500
committerjt1134 <jt1134@gmail.com>2012-11-01 22:15:35 -0500
commit2b622032210bf1c513802b235c14a18d31cdb69a (patch)
tree5f9cef27a88ed6a53d18bae69740cf856f7809e1 /extendedcommands.c
parent58cd3b9e1a1bc291ab709a638f4ef115800e6440 (diff)
downloadbootable_recovery-2b622032210bf1c513802b235c14a18d31cdb69a.zip
bootable_recovery-2b622032210bf1c513802b235c14a18d31cdb69a.tar.gz
bootable_recovery-2b622032210bf1c513802b235c14a18d31cdb69a.tar.bz2
move "install zip from sideload" to installation submenu
Change-Id: I27a763a0d41085719a6c7d9c3b8a20fbcae4b072
Diffstat (limited to 'extendedcommands.c')
-rw-r--r--extendedcommands.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/extendedcommands.c b/extendedcommands.c
index c9c37a3..dbf86db 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;
@@ -111,18 +112,20 @@ int install_zip(const char* packagefilepath)
#define ITEM_CHOOSE_ZIP 0
#define ITEM_APPLY_SDCARD 1
-#define ITEM_SIG_CHECK 2
-#define ITEM_CHOOSE_ZIP_INT 3
+#define ITEM_APPLY_SIDELOAD 2
+#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[] = { "Apply update from .zip file",
"",
NULL
};
char* install_menu_items[] = { "choose zip from sdcard",
"apply /sdcard/update.zip",
+ "install zip from sideload",
"toggle signature verification",
NULL,
NULL };
@@ -154,6 +157,9 @@ void show_install_update_menu()
case ITEM_CHOOSE_ZIP:
show_choose_zip_menu("/sdcard/");
break;
+ case ITEM_APPLY_SIDELOAD:
+ apply_from_adb();
+ break;
case ITEM_CHOOSE_ZIP_INT:
if (other_sd != NULL)
show_choose_zip_menu(other_sd);