diff options
author | Sungsoo <sungsoo@google.com> | 2016-10-18 14:12:00 +0900 |
---|---|---|
committer | Feng Yu <feny@google.com> | 2016-10-21 20:40:15 +0000 |
commit | ab2f065f401aefc9ba21865102dd40440ed083aa (patch) | |
tree | 4a603206c97739e685950e0b98f475673f36a24d | |
parent | 761bcb5ad2dd3168109009a31328643f556decba (diff) | |
download | base-ab2f065f401aefc9ba21865102dd40440ed083aa.tar.gz |
DO NOT MERGE) ExifInterface: Close the file when an exception happens
Bug: 32068647, Bug: 30936376
Change-Id: I22fa2384348c890ca726d2b1632cd54e59d25a8f
(cherry picked from commit cb17930077de640411407636eebc000e2d06dd9c)
-rw-r--r-- | media/java/android/media/ExifInterface.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/media/java/android/media/ExifInterface.java b/media/java/android/media/ExifInterface.java index e3beb4a22b6e..2c7160f7c756 100644 --- 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); } } |