aboutsummaryrefslogtreecommitdiffstats
path: root/default_device.cpp
diff options
context:
space:
mode:
authorDoug Zongker <dougz@android.com>2012-01-09 15:16:13 -0800
committerDoug Zongker <dougz@android.com>2012-01-10 10:18:17 -0800
commit9270a20a801403c9f60d6a701b39eae70d380403 (patch)
tree5bdb058af5b05a65112297a504018ee356e0ddbb /default_device.cpp
parent210f887382e0fd7e51ec6ce071972374a76f0722 (diff)
downloadbootable_recovery-9270a20a801403c9f60d6a701b39eae70d380403.zip
bootable_recovery-9270a20a801403c9f60d6a701b39eae70d380403.tar.gz
bootable_recovery-9270a20a801403c9f60d6a701b39eae70d380403.tar.bz2
support "sideload over ADB" mode
Rather than depending on the existence of some place to store a file that is accessible to users on an an unbootable device (eg, a physical sdcard, external USB drive, etc.), add support for sideloading packages sent to the device with adb. This change adds a "minimal adbd" which supports nothing but receiving a package over adb (with the "adb sideload" command) and storing it to a fixed filename in the /tmp ramdisk, from where it can be verified and sideloaded in the usual way. This should be leave available even on locked user-build devices. The user can select "apply package from ADB" from the recovery menu, which starts minimal-adb mode (shutting down any real adbd that may be running). Once minimal-adb has received a package it exits (restarting real adbd if appropriate) and then verification and installation of the received package proceeds. Change-Id: I6fe13161ca064a98d06fa32104e1f432826582f5
Diffstat (limited to 'default_device.cpp')
-rw-r--r--default_device.cpp10
1 files changed, 4 insertions, 6 deletions
diff --git a/default_device.cpp b/default_device.cpp
index 265ed07..648eaec 100644
--- a/default_device.cpp
+++ b/default_device.cpp
@@ -26,8 +26,7 @@ static const char* HEADERS[] = { "Volume up/down to move highlight;",
NULL };
static const char* ITEMS[] = {"reboot system now",
- "apply update from external storage",
- "apply update from cache",
+ "apply update from ADB",
"wipe data/factory reset",
"wipe cache partition",
NULL };
@@ -72,10 +71,9 @@ class DefaultDevice : public Device {
BuiltinAction InvokeMenuItem(int menu_position) {
switch (menu_position) {
case 0: return REBOOT;
- case 1: return APPLY_EXT;
- case 2: return APPLY_CACHE;
- case 3: return WIPE_DATA;
- case 4: return WIPE_CACHE;
+ case 1: return APPLY_ADB_SIDELOAD;
+ case 2: return WIPE_DATA;
+ case 3: return WIPE_CACHE;
default: return NO_ACTION;
}
}