commit 05d9ec9a8a60173303d8c518695ab702cb7338e6
author TreeHugger Robot <treehugger-gerrit@google.com> Sat Apr 14 01:08:17 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Apr 14 01:08:17 2018 +0000
tree 446e98b5970f16f3d062dec832a8d9e8974193e9
parent 7b7901a849a69c044169f8f21a4849282435c0d1
parent 217b8fcf8647c758caed7963d3188e23509cdccb

Merge "adbd: increase oom_score_adj for `adb shell`" into pi-dev

adb/shell_service.cpp

diff --git a/adb/shell_service.cpp b/adb/shell_service.cpp
index 17c7eba..da1222b 100644
--- a/adb/shell_service.cpp
+++ b/adb/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 {