commit d498a4d0fc36eacbfa2727c84ce17218df6d7d1c
author Elliott Hughes <enh@google.com> Thu Nov 17 20:46:53 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Nov 17 20:46:53 2016 +0000
tree 9bb1b24b47436daa2a4576db5f0be37690629c70
parent e46b6ac273b2011756459c0d064bf9f78d14f157
parent 5f213365d6a350483a7135e44895482afffd95d4

Merge "Remove dead code." am: 3bde05d928
am: 8e5fb5a0e7

Change-Id: Icc3a59fc53d57ad4f60529e36b577bb8e38c7d49

adb/shell_service.cpp

diff --git a/adb/shell_service.cpp b/adb/shell_service.cpp
index e2b388b..4975fab 100644
--- a/adb/shell_service.cpp
+++ b/adb/shell_service.cpp
@@ -106,20 +106,6 @@
 
 namespace {
 
-void init_subproc_child()
-{
-    setsid();
-
-    // Set OOM score adjustment to prevent killing
-    int fd = adb_open("/proc/self/oom_score_adj", O_WRONLY | O_CLOEXEC);
-    if (fd >= 0) {
-        adb_write(fd, "0", 1);
-        adb_close(fd);
-    } else {
-       D("adb: unable to update oom_score_adj");
-    }
-}
-
 // Reads from |fd| until close or failure.
 std::string ReadAll(int fd) {
     char buffer[512];
@@ -316,7 +302,7 @@
 
     if (pid_ == 0) {
         // Subprocess child.
-        init_subproc_child();
+        setsid();
 
         if (type_ == SubprocessType::kPty) {
             child_stdinout_sfd.reset(OpenPtyChildFd(pts_name, &child_error_sfd));