diff options
| author | Mårten Kongstad <marten.kongstad@sonymobile.com> | 2014-11-07 10:45:49 +0100 |
|---|---|---|
| committer | Zoran Jovanovic <zoran.jovanovic@sonymobile.com> | 2014-11-07 16:07:21 +0100 |
| commit | 840796a3c29183a6f9bcf3d50ecae45405b63d88 (patch) | |
| tree | 8dc088e701133afb1d5033d655c79e15544f52c2 /core | |
| parent | 97b5df764344c32f8551483385ac4be742427580 (diff) | |
| download | frameworks_base-840796a3c29183a6f9bcf3d50ecae45405b63d88.zip frameworks_base-840796a3c29183a6f9bcf3d50ecae45405b63d88.tar.gz frameworks_base-840796a3c29183a6f9bcf3d50ecae45405b63d88.tar.bz2 | |
RRO tests: fix potential NPE
Bug: 17765434
Check for null before closing streams.
Change-Id: I651785649575725009f270d4d8eb5f4bf90952a6
Diffstat (limited to 'core')
| -rw-r--r-- | core/tests/overlaytests/OverlayTest/src/com/android/overlaytest/OverlayBaseTest.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/core/tests/overlaytests/OverlayTest/src/com/android/overlaytest/OverlayBaseTest.java b/core/tests/overlaytests/OverlayTest/src/com/android/overlaytest/OverlayBaseTest.java index 42de9ea..e57c55c 100644 --- a/core/tests/overlaytests/OverlayTest/src/com/android/overlaytest/OverlayBaseTest.java +++ b/core/tests/overlaytests/OverlayTest/src/com/android/overlaytest/OverlayBaseTest.java @@ -225,8 +225,12 @@ public abstract class OverlayBaseTest extends AndroidTestCase { reader = new BufferedReader(new InputStreamReader(input)); actual = reader.readLine(); } finally { - reader.close(); - input.close(); + if (reader != null) { + reader.close(); + } + if (input != null) { + input.close(); + } } final String no = "Lorem ipsum dolor sit amet, consectetur adipisicing elit, " + |