commit 41b775b40a0ded7976509e284fc0694001b11233
author Sungsoo <sungsoo@google.com> Tue Oct 18 17:28:58 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Oct 18 17:28:58 2016 +0000
tree b041428df376d8bb3d0bbc0653eadb5da9712447
parent 6d7f209964c53de4c912b825bb54f0d9a7a4c527
parent ad74e88f1d568eb5e938ea2d9c604f2390f4fec3

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

Change-Id: Ic8a6e5b579c028a560436cdc6c3ca68a51cbf229

media/java/android/media/ExifInterface.java

diff --git a/media/java/android/media/ExifInterface.java b/media/java/android/media/ExifInterface.java
index 532368f..72afabf 100644
--- a/media/java/android/media/ExifInterface.java
+++ b/media/java/android/media/ExifInterface.java
@@ -1330,8 +1330,9 @@
         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 @@
             if (DEBUG) {
                 printAttributes();
             }
+            IoUtils.closeQuietly(in);
         }
     }