diff options
| author | Tao Bao <tbao@google.com> | 2017-01-24 05:58:27 +0100 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-01-24 05:58:27 +0100 |
| commit | 1313a9636db0231ec33b346d7a8ee2157eb35242 (patch) | |
| tree | 586a70f7db88c9d24e6a23ffe1dce574083ff3f5 | |
| parent | Merge "bootctrl HAL uses "default" service name" (diff) | |
| parent | Merge "Print with newline for ui_print." (diff) | |
| download | android_bootable_recovery-1313a9636db0231ec33b346d7a8ee2157eb35242.tar android_bootable_recovery-1313a9636db0231ec33b346d7a8ee2157eb35242.tar.gz android_bootable_recovery-1313a9636db0231ec33b346d7a8ee2157eb35242.tar.bz2 android_bootable_recovery-1313a9636db0231ec33b346d7a8ee2157eb35242.tar.lz android_bootable_recovery-1313a9636db0231ec33b346d7a8ee2157eb35242.tar.xz android_bootable_recovery-1313a9636db0231ec33b346d7a8ee2157eb35242.tar.zst android_bootable_recovery-1313a9636db0231ec33b346d7a8ee2157eb35242.zip | |
| -rw-r--r-- | install.cpp | 6 | ||||
| -rw-r--r-- | updater/install.cpp | 1 | ||||
| -rw-r--r-- | updater/updater.cpp | 1 |
3 files changed, 1 insertions, 7 deletions
diff --git a/install.cpp b/install.cpp index d3ab2136d..959a74222 100644 --- a/install.cpp +++ b/install.cpp @@ -420,11 +420,7 @@ static int try_update_binary(const char* path, ZipArchiveHandle zip, bool* wipe_ LOG(ERROR) << "invalid \"set_progress\" parameters: " << line; } } else if (command == "ui_print") { - if (!args.empty()) { - ui->PrintOnScreenOnly("%s", args.c_str()); - } else { - ui->PrintOnScreenOnly("\n"); - } + ui->PrintOnScreenOnly("%s\n", args.c_str()); fflush(stdout); } else if (command == "wipe_cache") { *wipe_cache = true; diff --git a/updater/install.cpp b/updater/install.cpp index 643145447..7a8e92f6c 100644 --- a/updater/install.cpp +++ b/updater/install.cpp @@ -76,7 +76,6 @@ static void uiPrint(State* state, const std::string& buffer) { for (auto& line : lines) { if (!line.empty()) { fprintf(ui->cmd_pipe, "ui_print %s\n", line.c_str()); - fprintf(ui->cmd_pipe, "ui_print\n"); } } diff --git a/updater/updater.cpp b/updater/updater.cpp index 473066263..22c060fcb 100644 --- a/updater/updater.cpp +++ b/updater/updater.cpp @@ -191,7 +191,6 @@ int main(int argc, char** argv) { } fprintf(cmd_pipe, "ui_print %s\n", line.c_str()); } - fprintf(cmd_pipe, "ui_print\n"); } if (state.error_code != kNoError) { |