summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2015-09-10 22:33:58 +0200
committerTao Bao <tbao@google.com>2015-09-10 22:42:05 +0200
commit9a7fd80d2dd706343f24c91b0756771aca8504a5 (patch)
tree89321a9b2d5892ced04b3c3c387ccda6ed9c1fd6
parentMerge "updater: Fix the line breaks in ui_print commands." (diff)
downloadandroid_bootable_recovery-9a7fd80d2dd706343f24c91b0756771aca8504a5.tar
android_bootable_recovery-9a7fd80d2dd706343f24c91b0756771aca8504a5.tar.gz
android_bootable_recovery-9a7fd80d2dd706343f24c91b0756771aca8504a5.tar.bz2
android_bootable_recovery-9a7fd80d2dd706343f24c91b0756771aca8504a5.tar.lz
android_bootable_recovery-9a7fd80d2dd706343f24c91b0756771aca8504a5.tar.xz
android_bootable_recovery-9a7fd80d2dd706343f24c91b0756771aca8504a5.tar.zst
android_bootable_recovery-9a7fd80d2dd706343f24c91b0756771aca8504a5.zip
Diffstat (limited to '')
-rw-r--r--recovery.cpp3
-rw-r--r--screen_ui.cpp2
2 files changed, 1 insertions, 4 deletions
diff --git a/recovery.cpp b/recovery.cpp
index c683bae1d..379137a64 100644
--- a/recovery.cpp
+++ b/recovery.cpp
@@ -745,10 +745,7 @@ static void choose_recovery_file(Device* device) {
int chosen_item = get_menu_selection(headers, entries, 1, 0, device);
if (strcmp(entries[chosen_item], "Back") == 0) break;
- // TODO: do we need to redirect? ShowFile could just avoid writing to stdio.
- redirect_stdio("/dev/null");
ui->ShowFile(entries[chosen_item]);
- redirect_stdio(TEMPORARY_LOG_FILE);
}
for (size_t i = 0; i < (sizeof(entries) / sizeof(*entries)); i++) {
diff --git a/screen_ui.cpp b/screen_ui.cpp
index ddf85c19e..f2fda2fb5 100644
--- a/screen_ui.cpp
+++ b/screen_ui.cpp
@@ -581,7 +581,7 @@ void ScreenRecoveryUI::ShowFile(FILE* fp) {
bool show_prompt = false;
while (true) {
if (show_prompt) {
- Print("--(%d%% of %d bytes)--",
+ PrintOnScreenOnly("--(%d%% of %d bytes)--",
static_cast<int>(100 * (double(ftell(fp)) / double(sb.st_size))),
static_cast<int>(sb.st_size));
Redraw();