commit 64b91ee9c2275def8fb797ad0eb98413786d414f
author Tao Bao <tbao@google.com> Tue Jan 24 05:09:29 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Jan 24 05:09:29 2017 +0000
tree 97cc403993662c37d4cd6e6a33a0ae22f73d726b
parent 028f77e24e31126a15809a43187f5239ae61d1ac
parent 64768cef878f2a9dc49b15e279b6649fa31f2a7a

Merge "Print with newline for ui_print." am: 90deaf9ab7 am: 1313a9636d am: 14be4eb8ce
am: 64768cef87

Change-Id: I5afd90b6e26e3eeae05f5a04c8cd2b985f53c2c9

install.cpp

diff --git a/install.cpp b/install.cpp
index 9bb1216..553ebae 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) {