Merge "Don't send $TERM unless we're talking to a new adbd." (9f903687) · Commits · e / os / android_system_core

adb/commandline.cpp

+5 −4

Original line number	Diff line number	Diff line
		@@ -591,14 +591,15 @@ static std::string ShellServiceString(bool use_shell_protocol,
		std::vector<std::string> args;
		if (use_shell_protocol) {
		args.push_back(kShellServiceArgShellProtocol);
		}
		if (!type_arg.empty()) {
		args.push_back(type_arg);
		}

		const char* terminal_type = getenv("TERM");
		if (terminal_type != nullptr) {
		args.push_back(std::string("TERM=") + terminal_type);
		}
		}
		if (!type_arg.empty()) {
		args.push_back(type_arg);
		}

		// Shell service string can look like: shell[,arg1,arg2,...]:[command].
		return android::base::StringPrintf("shell%s%s:%s",