Snap for 11510257 from b2502802c4b488efe62bd0e8eba0a3d6cc4bdd50 to simpleperf-releasesimpleperf-release

Change-Id: I6e384ae7aa8de505b397f3e0449e778a71997159

1 files changed, 9 insertions, 1 deletions

diff --git a/src/vogar/monitor/InterleavedReader.java b/src/vogar/monitor/InterleavedReader.java
index 2f9f15a..a97ba56 100644
--- a/src/vogar/monitor/InterleavedReader.java
+++ b/src/vogar/monitor/InterleavedReader.java
@@ -78,7 +78,15 @@ public final class InterleavedReader implements Closeable {
     int textEnd;
 
     while (true) {
-      int r = reader.read(buffer, count, buffer.length - count);
+      int r = -1;
+
+      try {
+          r = reader.read(buffer, count, buffer.length - count);
+      } catch (IOException e) {
+          // When running under gcstress, the output stream may be closed outside our control when
+          // the target process exits. In order to allow this, catch the stream closed exception and
+          // return whatever has been buffered already. (b/308917607)
+      }
 
       if (r == -1) {
         // the input is exhausted; return the remaining characters