Commit: 81a958fc287bc8b1c0601960f466828f4abb0c2c - frameworks-base (git)

frameworks/base

Commit MetaInfo

• Revision: 81a958fc287bc8b1c0601960f466828f4abb0c2c (tree)
• Time: 2016-11-04 05:59:59
• Author: Sungsoo <sungsoo@goog...>
• Commiter: gitbuildkicker

Log Message

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

Bug: 32068647, Bug: 30936376
Change-Id: I22fa2384348c890ca726d2b1632cd54e59d25a8f
(cherry picked from commit cb17930077de640411407636eebc000e2d06dd9c)

Change Summary

• modified: media/java/android/media/ExifInterface.java

Incremental Difference

--- a/media/java/android/media/ExifInterface.java
+++ b/media/java/android/media/ExifInterface.java
@@ -1335,8 +1335,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) {
@@ -1349,6 +1350,7 @@ public class ExifInterface {
             if (DEBUG) {
                 printAttributes();
             }
+            IoUtils.closeQuietly(in);
         }
     }