diff options
| author | Elliott Hughes <enh@google.com> | 2015-03-23 16:03:23 +0100 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-03-23 16:03:24 +0100 |
| commit | e944944fa58f66dad5483b6ee1ea9a2c0f9bedd2 (patch) | |
| tree | 0fd31cd73e5dc9ae3160612e58b5570a2b884b67 /recovery.cpp | |
| parent | Merge "Remove unused libutils references." (diff) | |
| parent | Add "Apply update from sdcard" to default recovery image. (diff) | |
| download | android_bootable_recovery-e944944fa58f66dad5483b6ee1ea9a2c0f9bedd2.tar android_bootable_recovery-e944944fa58f66dad5483b6ee1ea9a2c0f9bedd2.tar.gz android_bootable_recovery-e944944fa58f66dad5483b6ee1ea9a2c0f9bedd2.tar.bz2 android_bootable_recovery-e944944fa58f66dad5483b6ee1ea9a2c0f9bedd2.tar.lz android_bootable_recovery-e944944fa58f66dad5483b6ee1ea9a2c0f9bedd2.tar.xz android_bootable_recovery-e944944fa58f66dad5483b6ee1ea9a2c0f9bedd2.tar.zst android_bootable_recovery-e944944fa58f66dad5483b6ee1ea9a2c0f9bedd2.zip | |
Diffstat (limited to '')
| -rw-r--r-- | recovery.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/recovery.cpp b/recovery.cpp index 07606137b..641f36f3e 100644 --- a/recovery.cpp +++ b/recovery.cpp @@ -512,7 +512,7 @@ prepend_title(const char* const* headers) { const char** new_headers = (const char**)malloc((count+1) * sizeof(char*)); const char** h = new_headers; - *(h++) = "Android system recovery <" EXPAND(RECOVERY_API_VERSION) "e>"; + *(h++) = "Android system recovery (API " EXPAND(RECOVERY_API_VERSION) ")"; *(h++) = recovery_version; *(h++) = ""; for (p = headers; *p; ++p, ++h) *h = *p; @@ -877,7 +877,11 @@ prompt_and_wait(Device* device, int status) { break; case Device::APPLY_EXT: { - ensure_path_mounted(SDCARD_ROOT); + if (ensure_path_mounted(SDCARD_ROOT) != 0) { + ui->Print("\n-- Couldn't mount %s.\n", SDCARD_ROOT); + break; + } + char* path = browse_directory(SDCARD_ROOT, device); if (path == NULL) { ui->Print("\n-- No package file selected.\n", path); @@ -910,7 +914,7 @@ prompt_and_wait(Device* device, int status) { } else if (!ui->IsTextVisible()) { return Device::NO_ACTION; // reboot if logs aren't visible } else { - ui->Print("\nInstall from sdcard complete.\n"); + ui->Print("\nInstall from SD card complete.\n"); } } break; |