commit 07dc3ef44485c6af9d8caf546bdda8ccdfd14f60
author Josh Gao <jmgao@google.com> Thu Mar 29 20:34:54 2018 +0000
committer android-build-merger <android-build-merger@google.com> Thu Mar 29 20:34:54 2018 +0000
tree 60fc55ffd081c2fd8876ec4c559c071409cc0fe1
parent ea9f6c26f08b58cebb0dd901e325a6119447e446
parent 72332ceb9b99166864ed53516b223f71ed83b483

Merge "adbd: increase oom_score_adj for `adb shell`"
am: db9671090d

Change-Id: I728eb8d2ab2e2fe1e06e5aa5681ef57c655184b1

adb/daemon/shell_service.cpp

diff --git a/adb/daemon/shell_service.cpp b/adb/daemon/shell_service.cpp
index 17c7eba..da1222b 100644
--- a/adb/daemon/shell_service.cpp
+++ b/adb/daemon/shell_service.cpp
@@ -334,6 +334,15 @@
         // processes, so we need to manually reset back to SIG_DFL here (http://b/35209888).
         signal(SIGPIPE, SIG_DFL);
 
+        // Increase oom_score_adj from -1000, so that the child is visible to the OOM-killer.
+        // Don't treat failure as an error, because old Android kernels explicitly disabled this.
+        int oom_score_adj_fd = adb_open("/proc/self/oom_score_adj", O_WRONLY | O_CLOEXEC);
+        if (oom_score_adj_fd != -1) {
+            const char* oom_score_adj_value = "-950";
+            TEMP_FAILURE_RETRY(
+                adb_write(oom_score_adj_fd, oom_score_adj_value, strlen(oom_score_adj_value)));
+        }
+
         if (command_.empty()) {
             execle(_PATH_BSHELL, _PATH_BSHELL, "-", nullptr, cenv.data());
         } else {