commit 43568a558d8ce9a27d47e7be1d840440ba8e7649
author Josh Gao <jmgao@google.com> Wed Jan 20 23:53:42 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jan 20 23:53:42 2016 +0000
tree 3907957ea404ba6e6910204e8a426d915fc9e445
parent aae8b5536ec7db764e965e0976e3c93c29b8e8f5
parent 7e923fb3c5ad5c32978e7bd4dc509501b0d05d72

Merge "adbd: use pty to determine whether a session is interactive."
am: 7e923fb3c5

* commit '7e923fb3c5ad5c32978e7bd4dc509501b0d05d72':
  adbd: use pty to determine whether a session is interactive.

adb/shell_service.cpp

diff --git a/adb/shell_service.cpp b/adb/shell_service.cpp
index 95dff11..e092dc4 100644
--- a/adb/shell_service.cpp
+++ b/adb/shell_service.cpp
@@ -183,7 +183,6 @@
     ~Subprocess();
 
     const std::string& command() const { return command_; }
-    bool is_interactive() const { return command_.empty(); }
 
     int local_socket_fd() const { return local_socket_sfd_.fd(); }
 
@@ -332,7 +331,7 @@
         parent_error_sfd.Reset();
         close_on_exec(child_error_sfd.fd());
 
-        if (is_interactive()) {
+        if (command_.empty()) {
             execle(_PATH_BSHELL, _PATH_BSHELL, "-", nullptr, cenv.data());
         } else {
             execle(_PATH_BSHELL, _PATH_BSHELL, "-c", command_.c_str(), nullptr, cenv.data());
@@ -409,20 +408,6 @@
         exit(-1);
     }
 
-    if (!is_interactive()) {
-        termios tattr;
-        if (tcgetattr(child_fd, &tattr) == -1) {
-            WriteFdExactly(error_sfd->fd(), "tcgetattr failed");
-            exit(-1);
-        }
-
-        cfmakeraw(&tattr);
-        if (tcsetattr(child_fd, TCSADRAIN, &tattr) == -1) {
-            WriteFdExactly(error_sfd->fd(), "tcsetattr failed");
-            exit(-1);
-        }
-    }
-
     return child_fd;
 }