From 31f0f1bcee760afb5e2ef79c97c22714bf3a4657 Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Thu, 14 Jun 2018 10:46:05 -0700 Subject: [PATCH] Fix `adb logcat` return code. `adb shell logcat` works, and `adb logcat` should too. Bug: http://b/110202648 Test: suspended the logd process and manually removed the socket Change-Id: If14de7c2eb178c7b4210d6bdb44df084615db33a --- adb/client/commandline.cpp | 9 ++++----- adb/client/commandline.h | 4 ++-- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/adb/client/commandline.cpp b/adb/client/commandline.cpp index 39983ab4c..06fcf1639 100644 --- a/adb/client/commandline.cpp +++ b/adb/client/commandline.cpp @@ -1136,8 +1136,7 @@ static int logcat(int argc, const char** argv) { cmd += " " + escape_arg(*argv++); } - // No need for shell protocol with logcat, always disable for simplicity. - return send_shell_command(cmd, true); + return send_shell_command(cmd); } static void write_zeros(int bytes, int fd) { @@ -1861,7 +1860,7 @@ static int uninstall_app(int argc, const char** argv) { cmd += " " + escape_arg(*argv++); } - return send_shell_command(cmd, false); + return send_shell_command(cmd); } static int install_app(int argc, const char** argv) { @@ -2049,7 +2048,7 @@ static int pm_command(int argc, const char** argv) { cmd += " " + escape_arg(*argv++); } - return send_shell_command(cmd, false); + return send_shell_command(cmd); } static int uninstall_app_legacy(int argc, const char** argv) { @@ -2073,7 +2072,7 @@ static int uninstall_app_legacy(int argc, const char** argv) { static int delete_file(const std::string& filename) { std::string cmd = "rm -f " + escape_arg(filename); - return send_shell_command(cmd, false); + return send_shell_command(cmd); } static int install_app_legacy(int argc, const char** argv) { diff --git a/adb/client/commandline.h b/adb/client/commandline.h index 36cd79841..3d10030fa 100644 --- a/adb/client/commandline.h +++ b/adb/client/commandline.h @@ -92,7 +92,7 @@ int adb_commandline(int argc, const char** argv); // resulting output. // if |callback| is non-null, stdout/stderr output will be handled by it. int send_shell_command( - const std::string& command, bool disable_shell_protocol, - StandardStreamsCallbackInterface* callback = &DEFAULT_STANDARD_STREAMS_CALLBACK); + const std::string& command, bool disable_shell_protocol = false, + StandardStreamsCallbackInterface* callback = &DEFAULT_STANDARD_STREAMS_CALLBACK); #endif // COMMANDLINE_H