DO NOT MERGE) ExifInterface: Close the file when an exception happens am: 418e0869ba

am: a5affb045e

Change-Id: I4bb4440c019839073b4fcf6df54d726a02286680

media/java/android/media/ExifInterface.java

@@ -1330,8 +1330,9 @@ public class ExifInterface {
         for (int i = 0; i < EXIF_TAGS.length; ++i) {
             mAttributes[i] = new HashMap();
         }
+        InputStream in = null;
         try {
-            InputStream in = new FileInputStream(mFilename);
+            in = new FileInputStream(mFilename);
             getJpegAttributes(in);
             mIsSupportedFile = true;
         } catch (IOException e) {
@@ -1344,6 +1345,7 @@ public class ExifInterface {
             if (DEBUG) {
                 printAttributes();
             }
+            IoUtils.closeQuietly(in);
         }
     }