Avoid NPE if we fail to fetch stderr
Test: unit tests
Bug: 154225800
Change-Id: Idecb2d5996f236c863bc1dc23fef6c85ea4114bb
diff --git a/src/com/android/tradefed/invoker/RemoteInvocationExecution.java b/src/com/android/tradefed/invoker/RemoteInvocationExecution.java
index d7843d9..a87a79e 100644
--- a/src/com/android/tradefed/invoker/RemoteInvocationExecution.java
+++ b/src/com/android/tradefed/invoker/RemoteInvocationExecution.java
@@ -359,8 +359,12 @@
info,
options,
runUtil);
- mRemoteConsoleStdErr = FileUtil.readStringFromFile(stderr);
- FileUtil.recursiveDelete(stderr);
+ if (stderr != null && stderr.exists()) {
+ mRemoteConsoleStdErr = FileUtil.readStringFromFile(stderr);
+ FileUtil.recursiveDelete(stderr);
+ } else {
+ mRemoteConsoleStdErr = "Failed to fetch stderr from remote.";
+ }
}
// If not result in progress are reported, parse the full results at the end.