commit 2e48cb95ebcf1744349a109605ee31ca81760a84
author Josh Gao <jmgao@google.com> Thu Jun 23 21:25:10 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jun 23 21:25:10 2016 +0000
tree 100097677e6cf7a63698dc38046db0e63cf4fb72
parent 70eeb88fa74b148143a93dad2b11c1453ff598f7
parent eba4fdeb24e5f7a677f152f57c00a8c957b07e6f

Merge changes Ia59c6dbe,I13b17bcd
am: 0b47d08303

Change-Id: Ica4c5de30e12f6950f0a9f3a2dc94213ef2fe70a

adb/shell_service.cpp

diff --git a/adb/shell_service.cpp b/adb/shell_service.cpp
index 10b2502..d83622c 100644
--- a/adb/shell_service.cpp
+++ b/adb/shell_service.cpp
@@ -155,7 +155,7 @@
 
     const std::string& command() const { return command_; }
 
-    int local_socket_fd() const { return local_socket_sfd_; }
+    int ReleaseLocalSocket() { return local_socket_sfd_.release(); }
 
     pid_t pid() const { return pid_; }
 
@@ -449,7 +449,7 @@
     Subprocess* subprocess = reinterpret_cast<Subprocess*>(userdata);
 
     adb_thread_setname(android::base::StringPrintf(
-            "shell srvc %d", subprocess->local_socket_fd()));
+            "shell srvc %d", subprocess->pid()));
 
     D("passing data streams for PID %d", subprocess->pid());
     subprocess->PassDataStreams();
@@ -756,7 +756,7 @@
         return ReportError(protocol, error);
     }
 
-    unique_fd local_socket(dup(subprocess->local_socket_fd()));
+    unique_fd local_socket(subprocess->ReleaseLocalSocket());
     D("subprocess creation successful: local_socket_fd=%d, pid=%d", local_socket.get(),
       subprocess->pid());