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

* commit '6a53bd9ddbff5dcccec3cd3928e10317007031d3':
  RRO tests: fix potential NPE
This commit is contained in:
Conley Owens
2014-11-26 18:14:34 +00:00
committed by Android Git Automerger

View File

@@ -225,9 +225,13 @@ public abstract class OverlayBaseTest extends AndroidTestCase {
reader = new BufferedReader(new InputStreamReader(input)); reader = new BufferedReader(new InputStreamReader(input));
actual = reader.readLine(); actual = reader.readLine();
} finally { } finally {
if (reader != null) {
reader.close(); reader.close();
}
if (input != null) {
input.close(); input.close();
} }
}
final String no = "Lorem ipsum dolor sit amet, consectetur adipisicing elit, " + final String no = "Lorem ipsum dolor sit amet, consectetur adipisicing elit, " +
"sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. " + "sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. " +