commit 605241984cc41f62e2f2e005865d7afed504a972
author Tao Bao <tbao@google.com> Sat Sep 12 01:15:45 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Sat Sep 12 01:15:45 2015 +0000
tree e1fc8d5073c8b3b432104aa6d9b91f836c622e2a
parent 0cf19d9ba10c325af928e44d2c11bc74daa39a7c
parent b83fd518262853d42b5a73a61ec6fdfafe0f5564

am b83fd518: Merge "recovery: Remove redirect_stdio() when calling ShowFile()."

* commit 'b83fd518262853d42b5a73a61ec6fdfafe0f5564':
  recovery: Remove redirect_stdio() when calling ShowFile().

recovery.cpp

diff --git a/recovery.cpp b/recovery.cpp
index c683bae..379137a 100644
--- a/recovery.cpp
+++ b/recovery.cpp
@@ -745,10 +745,7 @@
         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++) {

screen_ui.cpp

diff --git a/screen_ui.cpp b/screen_ui.cpp
index ddf85c1..f2fda2f 100644
--- a/screen_ui.cpp
+++ b/screen_ui.cpp
@@ -581,7 +581,7 @@
     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();