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

* commit '69d28437d3416301895639b4c51f9b31842126f5': RRO tests: fix potential NPE
2014-11-26 18:02:45 +00:00
parent c657b302e5 69d28437d3
commit 6a53bd9ddb
1 changed files with 6 additions and 2 deletions
--- 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, " +