PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

display error state on OTA failure

Browse Source 
We need prompt_with_wait() to show either the ERROR or NO_COMMAND
state as appropriate.

Bug: 7221068
Change-Id: I191526cf12630d08b7a8250a2a81e724a4a5d972
This commit is contained in:
Doug Zongker
2012-09-24 10:40:47 -07:00
parent b66cb69e39
commit 6c8553dda8
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
recovery.cpp
View File

@@ -668,12 +668,22 @@ wipe_data(int confirm, Device* device) {
} }
static void static void
prompt_and_wait(Device* device) { prompt_and_wait(Device* device, int status) {
const char* const* headers = prepend_title(device->GetMenuHeaders()); const char* const* headers = prepend_title(device->GetMenuHeaders());
for (;;) { for (;;) {
finish_recovery(NULL); finish_recovery(NULL);
ui->SetBackground(RecoveryUI::NO_COMMAND); switch (status) {
case INSTALL_SUCCESS:
case INSTALL_NONE:
ui->SetBackground(RecoveryUI::NO_COMMAND);
break;
case INSTALL_ERROR:
case INSTALL_CORRUPT:
ui->SetBackground(RecoveryUI::ERROR);
break;
}
ui->SetProgressType(RecoveryUI::EMPTY); ui->SetProgressType(RecoveryUI::EMPTY);
int chosen_item = get_menu_selection(headers, device->GetMenuItems(), 0, 0, device); int chosen_item = get_menu_selection(headers, device->GetMenuItems(), 0, 0, device);
@@ -683,7 +693,6 @@ prompt_and_wait(Device* device) {
// statement below. // statement below.
chosen_item = device->InvokeMenuItem(chosen_item); chosen_item = device->InvokeMenuItem(chosen_item);
int status;
int wipe_cache; int wipe_cache;
switch (chosen_item) { switch (chosen_item) {
case Device::REBOOT: case Device::REBOOT:
@@ -920,7 +929,7 @@ main(int argc, char **argv) {
ui->SetBackground(RecoveryUI::ERROR); ui->SetBackground(RecoveryUI::ERROR);
} }
if (status != INSTALL_SUCCESS || ui->IsTextVisible()) { if (status != INSTALL_SUCCESS || ui->IsTextVisible()) {
prompt_and_wait(device); prompt_and_wait(device, status);
} }
// Otherwise, get ready to boot the main system... // Otherwise, get ready to boot the main system...