Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5e3589da authored by Elliott Hughes's avatar Elliott Hughes Committed by android-build-merger
Browse files

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

am: 9f903687

* commit '9f903687':
  Don't send $TERM unless we're talking to a new adbd.
parents 47f25063 9f903687

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",