Merge "Capture bugreport in sandbox rather than parent"
diff --git a/src/com/android/tradefed/sandbox/SandboxConfigDump.java b/src/com/android/tradefed/sandbox/SandboxConfigDump.java
index 6b6b7e8..2395bbb 100644
--- a/src/com/android/tradefed/sandbox/SandboxConfigDump.java
+++ b/src/com/android/tradefed/sandbox/SandboxConfigDump.java
@@ -106,10 +106,6 @@
// Ensure we get the stdout logging in FileLogger case.
((FileLogger) logger).setLogLevelDisplay(LogLevel.VERBOSE);
}
- // Turn off some of the invocation level options that would be duplicated in the
- // parent.
- config.getCommandOptions().setBugreportOnInvocationEnded(false);
- config.getCommandOptions().setBugreportzOnInvocationEnded(false);
// Ensure in special conditions (placeholder devices) we can still allocate.
secureDeviceAllocation(config);
diff --git a/src/com/android/tradefed/sandbox/TradefedSandbox.java b/src/com/android/tradefed/sandbox/TradefedSandbox.java
index 83572ca..14e4f6f 100644
--- a/src/com/android/tradefed/sandbox/TradefedSandbox.java
+++ b/src/com/android/tradefed/sandbox/TradefedSandbox.java
@@ -378,6 +378,10 @@
}
throw e;
}
+ // Turn off some of the invocation level options that would be duplicated in the
+ // child sandbox subprocess.
+ config.getCommandOptions().setBugreportOnInvocationEnded(false);
+ config.getCommandOptions().setBugreportzOnInvocationEnded(false);
} catch (IOException | ConfigurationException e) {
StreamUtil.close(mEventParser);
StreamUtil.close(mProtoReceiver);