Merge "RRO tests: fix potential NPE"

2014-11-26 17:57:08 +00:00
parent ed23786cc5 840796a3c2
commit 69d28437d3
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, " +