commit 53f335b8ec1bd4cc64a5a11180fff0eb62675bae
author Elliott Hughes <enh@google.com> Thu Nov 17 21:03:12 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Nov 17 21:03:12 2016 +0000
tree 53efafd597a26e516751f629c443584df353cac7
parent 60bdc1c934011d5a4d97784fcbef9a62211bfad7
parent ddec602adb029d41176899ac6bcecb728f009c42

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

Change-Id: Icf62e17bc762657a7277b198cb28f4a49ce3461c

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));