diff options
| author | Sungsoo <sungsoo@google.com> | 2016-10-18 14:12:00 +0900 |
|---|---|---|
| committer | Jessica Wagantall <jwagantall@cyngn.com> | 2016-12-12 12:39:22 -0800 |
| commit | bd9c6b18f0ad59c0b1bf75109e77b51b3b17d0b2 (patch) | |
| tree | a09dd08e7a3e17d00f6536f4f6aaa84e248d003c | |
| parent | 2ad19afb99ed0ea79ef7bf1606a24d4bc280d19d (diff) | |
| download | android_frameworks_base-stable/cm-13.0-ZNH5Y.tar.gz android_frameworks_base-stable/cm-13.0-ZNH5Y.tar.bz2 android_frameworks_base-stable/cm-13.0-ZNH5Y.zip | |
DO NOT MERGE) ExifInterface: Close the file when an exception happensstable/cm-13.0-ZNH5Y
CYNGNOS-3312
Bug: 32068647, Bug: 30936376
Change-Id: I22fa2384348c890ca726d2b1632cd54e59d25a8f
(cherry picked from commit cb17930077de640411407636eebc000e2d06dd9c)
(cherry picked from commit 2c79cada8897dcb171b8227b4ea91c292400702f)
(cherry picked from commit 596ffb80bb55a91f80a029c947d09f0911c616a3)
| -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 a2ccdc85598..bb7554790c1 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); } } |