[android] - using resources in a single try-with-resources blockupstream/lp-java-8-features

2 files changed, 7 insertions, 9 deletions

diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/IconFactory.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/IconFactory.java
index 24b057b9e6..3243aae541 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/IconFactory.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/IconFactory.java
@@ -145,10 +145,9 @@ public final class IconFactory {
    * @return The Icon that was loaded from the asset or null if failed to load.
    */
   public Icon fromAsset(@NonNull String assetName) {
-    try (AssetManager as = context.getAssets()) {
-      try (InputStream is = as.open(assetName)) {
-        return fromInputStream(is);
-      }
+    try (AssetManager as = context.getAssets();
+         InputStream is = as.open(assetName)) {
+      return fromInputStream(is);
     } catch (IOException ioException) {
       return null;
     }
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/GeoParseUtil.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/GeoParseUtil.java
index cace2083da..da05abc205 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/GeoParseUtil.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/GeoParseUtil.java
@@ -24,11 +24,10 @@ public class GeoParseUtil {
     if (TextUtils.isEmpty(fileName)) {
       throw new NullPointerException("No GeoJSON File Name passed in.");
     }
-    try (AssetManager as = context.getAssets()) {
-      try (InputStream is = as.open(fileName)) {
-        BufferedReader rd = new BufferedReader(new InputStreamReader(is, Charset.forName("UTF-8")));
-        return readAll(rd);
-      }
+    try (AssetManager as = context.getAssets();
+         InputStream is = as.open(fileName)) {
+      BufferedReader rd = new BufferedReader(new InputStreamReader(is, Charset.forName("UTF-8")));
+      return readAll(rd);
     }
   }