commit 2a4785b9be1ba8cbb62eef50c7e0527db94687fb
author Julien Desprez <jdesprez@google.com> Mon Apr 19 07:57:54 2021 -0700
committer Julien Desprez <jdesprez@google.com> Mon Apr 19 07:57:54 2021 -0700
tree 9d391b90ae3aad1efc6030f43670eab0237074d8
parent e80e5ba445ae8f00185773ffeae543e734d026a0

Robustness on logging sandbox

Test: unit tests
Bug: 185680163
Change-Id: I8ba7a09108d830af6f402432d983edc6b8a1a326

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 b2de972..7c84e7a 100644
--- a/src/com/android/tradefed/sandbox/TradefedSandbox.java
+++ b/src/com/android/tradefed/sandbox/TradefedSandbox.java
@@ -557,12 +557,19 @@
 
     private void logAndCleanHeapDump(File heapDumpDir, ITestLogger logger) {
         try {
-            if (heapDumpDir != null && heapDumpDir.listFiles().length != 0) {
-                for (File f : heapDumpDir.listFiles()) {
-                    FileInputStreamSource fileInput = new FileInputStreamSource(f);
-                    logger.testLog(f.getName(), LogDataType.HPROF, fileInput);
-                    StreamUtil.cancel(fileInput);
-                }
+            if (heapDumpDir == null) {
+                return;
+            }
+            if (!heapDumpDir.isDirectory()) {
+                return;
+            }
+            if (heapDumpDir.listFiles().length == 0) {
+                return;
+            }
+            for (File f : heapDumpDir.listFiles()) {
+                FileInputStreamSource fileInput = new FileInputStreamSource(f);
+                logger.testLog(f.getName(), LogDataType.HPROF, fileInput);
+                StreamUtil.cancel(fileInput);
             }
         } finally {
             FileUtil.recursiveDelete(heapDumpDir);