DO NOT MERGE: Fix CTS regression

Bug: 30297223, Bug: 30437363
Change-Id: I7b18af40e4eac2713577204428fbfb96cc346582
This commit is contained in:
Sungsoo Lim
2016-07-25 11:53:13 +09:00
parent 77b5526229
commit df17644db7

View File

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