Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

DO NOT MERGE: Fix CTS regression am: df17644db7

Browse Source 
am: 057b548171

Change-Id: I0ac1fec4b64a09dc8ee12986d8d91b39e511d989
This commit is contained in:
Sungsoo Lim
2016-07-29 18:38:06 +00:00
committed by android-build-merger
parent 58555ee891 057b548171
commit f645010092
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
media/java/android/media/ExifInterface.java
View File

@@ -1325,12 +1325,12 @@ public class ExifInterface {
* determine whether the image data format is JPEG or not. * determine whether the image data format is JPEG or not.
*/ */
private void loadAttributes() throws IOException { private void loadAttributes() throws IOException {
try {
InputStream in = new FileInputStream(mFilename);
// Initialize mAttributes. // Initialize mAttributes.
for (int i = 0; i < EXIF_TAGS.length; ++i) { for (int i = 0; i < EXIF_TAGS.length; ++i) {
mAttributes[i] = new HashMap(); mAttributes[i] = new HashMap();
} }
try {
InputStream in = new FileInputStream(mFilename);
getJpegAttributes(in); getJpegAttributes(in);
} catch (IOException e) { } catch (IOException e) {
// Ignore exceptions in order to keep the compatibility with the old versions of // Ignore exceptions in order to keep the compatibility with the old versions of