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

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

Browse Source 
* commit '605241984cc41f62e2f2e005865d7afed504a972':
  recovery: Remove redirect_stdio() when calling ShowFile().
This commit is contained in:
Tao Bao
2015-09-12 01:24:49 +00:00
committed by Android Git Automerger
parent 7c3d09c2f3 605241984c
commit 8b2dcfb104
2 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
recovery.cpp
-3
View File
@@ -745,10 +745,7 @@ static void choose_recovery_file(Device* device) {
int chosen_item = get_menu_selection(headers, entries, 1, 0, device); int chosen_item = get_menu_selection(headers, entries, 1, 0, device);
if (strcmp(entries[chosen_item], "Back") == 0) break; 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]); ui->ShowFile(entries[chosen_item]);
redirect_stdio(TEMPORARY_LOG_FILE);
} }
for (size_t i = 0; i < (sizeof(entries) / sizeof(*entries)); i++) { for (size_t i = 0; i < (sizeof(entries) / sizeof(*entries)); i++) {
screen_ui.cpp
+1 -1
View File
@@ -581,7 +581,7 @@ void ScreenRecoveryUI::ShowFile(FILE* fp) {
bool show_prompt = false; bool show_prompt = false;
while (true) { while (true) {
if (show_prompt) { 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>(100 * (double(ftell(fp)) / double(sb.st_size))),
static_cast<int>(sb.st_size)); static_cast<int>(sb.st_size));
Redraw(); Redraw();