commit 3f9f65b7219ccc24830c939b2beadf2d6ba64608
author Julien Desprez <jdesprez@google.com> Mon Apr 13 21:43:31 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Apr 13 21:43:31 2020 +0000
tree 92070b3e0d03defa64dcddb5f9a82b84fffdf473
parent d3ea42e8f0e3eb5ac8b8a8a40ab0ecb35dc691d6
parent 9f286447a7549327f6d685c2e0f8ae01277ea67e

Merge "Make sandbox interruptable"

src/com/android/tradefed/sandbox/TradefedSandbox.java

diff --git a/src/com/android/tradefed/sandbox/TradefedSandbox.java b/src/com/android/tradefed/sandbox/TradefedSandbox.java
index 9718642..e45b91e 100644
--- a/src/com/android/tradefed/sandbox/TradefedSandbox.java
+++ b/src/com/android/tradefed/sandbox/TradefedSandbox.java
@@ -120,7 +120,8 @@
         }
 
         long timeout = config.getCommandOptions().getInvocationTimeout();
-        mRunUtil.allowInterrupt(false);
+        // Allow interruption, subprocess should handle signals itself
+        mRunUtil.allowInterrupt(true);
         CommandResult result =
                 mRunUtil.runTimedCmd(timeout, mStdout, mStderr, mCmdArgs.toArray(new String[0]));
         // Log stdout and stderr