diff options
author | Tao Bao <tbao@google.com> | 2017-01-21 13:03:25 -0800 |
---|---|---|
committer | Tao Bao <tbao@google.com> | 2017-01-21 20:43:45 -0800 |
commit | f013642477dbe0a5ed8d440571e9c8676ed42b2d (patch) | |
tree | 536ba1489bcc83a8594ff7efc69ec3457de70664 /install.cpp | |
parent | e78ca37656d72d10952727c20f20c5044b4b3db0 (diff) | |
download | android_bootable_recovery-f013642477dbe0a5ed8d440571e9c8676ed42b2d.tar.gz android_bootable_recovery-f013642477dbe0a5ed8d440571e9c8676ed42b2d.tar.bz2 android_bootable_recovery-f013642477dbe0a5ed8d440571e9c8676ed42b2d.zip |
Print with newline for ui_print.
Currently the ui_print command between the recovery and updater doesn't
append newline. Updater has to send an extra "ui_print" command without
any argument to get the line break. This looks unnecessary. And not all
the callers (including the ones in bootable/recovery) are following this
protocol when sending the ui_print command.
This CL simplifies the protocol to always print with a newline for
ui_print command. When updating from an old recovery with the new
updater, all the ui_print'd strings would appear in one line as a side
effect. But a) it would only affect the text-mode UI, which won't be
shown to users; b) log files won't be affected.
Bug: 32305035
Test: Apply an update with the new updater on top of an old and new
recovery image respectively.
Change-Id: I305a0ffc6f180daf60919cf99d24d1495d68749b
Diffstat (limited to 'install.cpp')
-rw-r--r-- | install.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/install.cpp b/install.cpp index d3ab2136..959a7422 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; |