OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
6739ba0
)
DO NOT MERGE) ExifInterface: Close the file when an exception happens
author
Sungsoo
<sungsoo@google.com>
Tue, 18 Oct 2016 05:12:00 +0000
(14:12 +0900)
committer
Sungsoo Lim
<sungsoo@google.com>
Tue, 18 Oct 2016 16:17:29 +0000
(16:17 +0000)
Bug:
32068647
, Bug:
30936376
Change-Id: I22fa2384348c890ca726d2b1632cd54e59d25a8f
media/java/android/media/ExifInterface.java
patch
|
blob
|
history
diff --git
a/media/java/android/media/ExifInterface.java
b/media/java/android/media/ExifInterface.java
index
532368f
..
72afabf
100644
(file)
--- a/
media/java/android/media/ExifInterface.java
+++ b/
media/java/android/media/ExifInterface.java
@@
-1330,8
+1330,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) {
@@
-1344,6
+1345,7
@@
public class ExifInterface {
if (DEBUG) {
printAttributes();
}
+ IoUtils.closeQuietly(in);
}
}