提交: 596ffb80bb55a91f80a029c947d09f0911c616a3 - frameworks-base (git)

frameworks/base

Commit MetaInfo

• 修訂: 596ffb80bb55a91f80a029c947d09f0911c616a3 (tree)
• 時間: 2016-12-13 05:00:56
• 作者: Sungsoo <sungsoo@goog...>
• Commiter: Jessica Wagantall

Log Message

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

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

Change Summary

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

差異

--- 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);
         }
     }