ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Don\'t send screen unless we\'re talking to a new adbd."

Browse source 
am: 9f90368701

* commit '9f903687011c195154b0c69c02e6aaa35c867242':
  Don't send $TERM unless we're talking to a new adbd.
This commit is contained in:
Elliott Hughes 2015-11-18 21:04:14 +00:00 • committed by android-build-merger
commit 5e3589da14
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
adb/commandline.cpp
View file

@ -591,14 +591,15 @@ static std::string ShellServiceString(bool use_shell_protocol,
std::vector<std::string> args; std::vector<std::string> args;
if (use_shell_protocol) { if (use_shell_protocol) {
args.push_back(kShellServiceArgShellProtocol); args.push_back(kShellServiceArgShellProtocol);
const char* terminal_type = getenv("TERM");
if (terminal_type != nullptr) {
args.push_back(std::string("TERM=") + terminal_type);
}
} }
if (!type_arg.empty()) { if (!type_arg.empty()) {
args.push_back(type_arg); args.push_back(type_arg);
} }
const char* terminal_type = getenv("TERM");
if (terminal_type != nullptr) {
args.push_back(std::string("TERM=") + terminal_type);
}
// Shell service string can look like: shell[,arg1,arg2,...]:[command]. // Shell service string can look like: shell[,arg1,arg2,...]:[command].
return android::base::StringPrintf("shell%s%s:%s", return android::base::StringPrintf("shell%s%s:%s",