commit 88f64719d75620d144af5bba39a00a3f178ae60a
author The Android Automerger <android-build@google.com> Thu Jun 23 00:04:56 2016 -0700
committer The Android Automerger <android-build@google.com> Thu Jun 23 00:04:56 2016 -0700
tree cf8f449c1e5f087208c9d05da9e91d63859569ba
parent 42afe2033fddc7c43ccfeb5f20defe992d0bc1a2
parent a130ba1d717480d252f38ca62fb457fb5295453c

merge in nyc-release history after reset to nyc-dev

adb/shell_service.cpp

diff --git a/adb/shell_service.cpp b/adb/shell_service.cpp
index f98394d..104f399 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_.fd(); }
+    int ReleaseLocalSocket() { return local_socket_sfd_.Release(); }
 
     pid_t pid() const { return pid_; }
 
@@ -450,7 +450,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();
@@ -761,14 +761,13 @@
         return ReportError(protocol, error);
     }
 
-    unique_fd local_socket(dup(subprocess->local_socket_fd()));
-    D("subprocess creation successful: local_socket_fd=%d, pid=%d", local_socket.get(),
-      subprocess->pid());
+    int local_socket = subprocess->ReleaseLocalSocket();
+    D("subprocess creation successful: local_socket_fd=%d, pid=%d", local_socket, subprocess->pid());
 
     if (!Subprocess::StartThread(std::move(subprocess), &error)) {
         LOG(ERROR) << "failed to start subprocess management thread: " << error;
         return ReportError(protocol, error);
     }
 
-    return local_socket.release();
+    return local_socket;
 }