commit 1313a9636db0231ec33b346d7a8ee2157eb35242
author Tao Bao <tbao@google.com> Tue Jan 24 04:58:27 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Jan 24 04:58:27 2017 +0000
tree 586a70f7db88c9d24e6a23ffe1dce574083ff3f5
parent ee3030ad4e90a71504e64cea597304cc23c27ed7
parent 90deaf9ab7bae7fbdcdf475318a7411baa8da91e

Merge "Print with newline for ui_print."
am: 90deaf9ab7

Change-Id: Idfeb698aec25a5fe1a577dd3baf36afed8107c8a

install.cpp

diff --git a/install.cpp b/install.cpp
index d3ab213..959a742 100644
--- a/install.cpp
+++ b/install.cpp
@@ -420,11 +420,7 @@
         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;

updater/install.cpp

diff --git a/updater/install.cpp b/updater/install.cpp
index 6431454..7a8e92f 100644
--- a/updater/install.cpp
+++ b/updater/install.cpp
@@ -76,7 +76,6 @@
   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");
     }
   }
 

updater/updater.cpp

diff --git a/updater/updater.cpp b/updater/updater.cpp
index 4730662..22c060f 100644
--- a/updater/updater.cpp
+++ b/updater/updater.cpp
@@ -191,7 +191,6 @@
         }
         fprintf(cmd_pipe, "ui_print %s\n", line.c_str());
       }
-      fprintf(cmd_pipe, "ui_print\n");
     }
 
     if (state.error_code != kNoError) {