From 840796a3c29183a6f9bcf3d50ecae45405b63d88 Mon Sep 17 00:00:00 2001
From: Mårten Kongstad <marten.kongstad@sonymobile.com>
Date: Fri, 7 Nov 2014 10:45:49 +0100
Subject: RRO tests: fix potential NPE

Bug: 17765434

Check for null before closing streams.

Change-Id: I651785649575725009f270d4d8eb5f4bf90952a6
---
 .../OverlayTest/src/com/android/overlaytest/OverlayBaseTest.java  | 8 ++++++--
 1 file 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 42de9eab2347..e57c55ced046 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, " +
-- 
cgit v1.2.3-59-g8ed1b