openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Fix `adb logcat` return code."

This commit is contained in:
Elliott Hughes 2018-06-14 19:38:08 +00:00 committed by Gerrit Code Review
parent 445eacd326 31f0f1bcee
commit 5587aba58d
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
adb/client/commandline.cpp
View File

@ -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) {

4
adb/client/commandline.h
View File

@ -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