summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2017-01-24 06:00:27 +0100
committerandroid-build-merger <android-build-merger@google.com>2017-01-24 06:00:27 +0100
commit14be4eb8ce5389a09d341522f55f6ff5956c9273 (patch)
tree437fb921f2f3dcd347a1aca597dd991b9e6c1a67
parentMerge "bootctrl HAL uses "default" service name" am: cf1af460d5 (diff)
parentMerge "Print with newline for ui_print." (diff)
downloadandroid_bootable_recovery-14be4eb8ce5389a09d341522f55f6ff5956c9273.tar
android_bootable_recovery-14be4eb8ce5389a09d341522f55f6ff5956c9273.tar.gz
android_bootable_recovery-14be4eb8ce5389a09d341522f55f6ff5956c9273.tar.bz2
android_bootable_recovery-14be4eb8ce5389a09d341522f55f6ff5956c9273.tar.lz
android_bootable_recovery-14be4eb8ce5389a09d341522f55f6ff5956c9273.tar.xz
android_bootable_recovery-14be4eb8ce5389a09d341522f55f6ff5956c9273.tar.zst
android_bootable_recovery-14be4eb8ce5389a09d341522f55f6ff5956c9273.zip
-rw-r--r--install.cpp6
-rw-r--r--updater/install.cpp1
-rw-r--r--updater/updater.cpp1
3 files changed, 1 insertions, 7 deletions
diff --git a/install.cpp b/install.cpp
index 9bb1216cf..553ebae10 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) {