diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2012-05-09 14:36:40 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-05-09 14:36:40 -0700 |
| commit | 6367b1669d41f9fe7cd7abe5e05296edecd50f8e (patch) | |
| tree | 2d59625dfa9084d1601aab635df2011c4173aabd /core/tests | |
| parent | 9669a0ce574745ba0b0ebd32e8337811973fb7dc (diff) | |
| parent | 6de357e4d10fa5977ab9a6c665dc858765e95d34 (diff) | |
| download | frameworks_base-6367b1669d41f9fe7cd7abe5e05296edecd50f8e.zip frameworks_base-6367b1669d41f9fe7cd7abe5e05296edecd50f8e.tar.gz frameworks_base-6367b1669d41f9fe7cd7abe5e05296edecd50f8e.tar.bz2 | |
Merge "Recover from Throwable in FileRotator, dump." into jb-dev
Diffstat (limited to 'core/tests')
| -rw-r--r-- | core/tests/coretests/src/com/android/internal/util/FileRotatorTest.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/tests/coretests/src/com/android/internal/util/FileRotatorTest.java b/core/tests/coretests/src/com/android/internal/util/FileRotatorTest.java index 94d1cb6..95f0e67 100644 --- a/core/tests/coretests/src/com/android/internal/util/FileRotatorTest.java +++ b/core/tests/coretests/src/com/android/internal/util/FileRotatorTest.java @@ -187,12 +187,12 @@ public class FileRotatorTest extends AndroidTestCase { rotate.combineActive(reader, new Writer() { public void write(OutputStream out) throws IOException { new DataOutputStream(out).writeUTF("bar"); - throw new ProtocolException("yikes"); + throw new NullPointerException("yikes"); } }, currentTime); fail("woah, somehow able to write exception"); - } catch (ProtocolException e) { + } catch (IOException e) { // expected from above } |