commit 6a53bd9ddbff5dcccec3cd3928e10317007031d3
author Conley Owens <cco3@android.com> Wed Nov 26 18:02:45 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Nov 26 18:02:45 2014 +0000
tree eae6243c24d673c0389da483cce66ef66c40ca9f
parent c657b302e5744e7de9ca142126ba3b428ce5a143
parent 69d28437d3416301895639b4c51f9b31842126f5

am 69d28437: Merge "RRO tests: fix potential NPE"

* commit '69d28437d3416301895639b4c51f9b31842126f5':
  RRO tests: fix potential NPE

core/tests/overlaytests/OverlayTest/src/com/android/overlaytest/OverlayBaseTest.java

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 @@
             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, " +