commit ae202c6fda0e8075116356d4fb0753bd8acea3e1
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Mar 30 18:01:21 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Mar 30 18:01:21 2018 +0000
tree 798747a113e750aea5077e4def29038163c3ffa6
parent 09a42e955344e6e5e909da31aa5cce5fb9ede0c1
parent f044ef71faf1b622fa492ef7daa89c533c3092bf

Merge "Fix MemoryFileTest coretest" into pi-dev

core/tests/coretests/src/android/os/MemoryFileTest.java

diff --git a/core/tests/coretests/src/android/os/MemoryFileTest.java b/core/tests/coretests/src/android/os/MemoryFileTest.java
index 82af662e..20b298d 100644
--- a/core/tests/coretests/src/android/os/MemoryFileTest.java
+++ b/core/tests/coretests/src/android/os/MemoryFileTest.java
@@ -23,6 +23,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.nio.BufferOverflowException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -110,7 +111,7 @@
         try {
             os.write(new byte[] { -1, -1 });
             fail();
-        } catch (IndexOutOfBoundsException expected) {
+        } catch (IndexOutOfBoundsException | BufferOverflowException expected) {
         }
 
         byte[] copy = new byte[file.length()];