Skip to content

Commit 5aa2601

Browse files
Sungsoo Limgitbuildkicker
authored andcommitted
DO NOT MERGE: Fix CTS regression
Bug: 30297223, Bug: 30437363 Change-Id: I7b18af40e4eac2713577204428fbfb96cc346582
1 parent e739d9c commit 5aa2601

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

media/java/android/media/ExifInterface.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1330,12 +1330,12 @@ private void removeAttribute(String tag) {
13301330
* determine whether the image data format is JPEG or not.
13311331
*/
13321332
private void loadAttributes() throws IOException {
1333+
// Initialize mAttributes.
1334+
for (int i = 0; i < EXIF_TAGS.length; ++i) {
1335+
mAttributes[i] = new HashMap();
1336+
}
13331337
try {
13341338
InputStream in = new FileInputStream(mFilename);
1335-
// Initialize mAttributes.
1336-
for (int i = 0; i < EXIF_TAGS.length; ++i) {
1337-
mAttributes[i] = new HashMap();
1338-
}
13391339
getJpegAttributes(in);
13401340
} catch (IOException e) {
13411341
// Ignore exceptions in order to keep the compatibility with the old versions of

0 commit comments

Comments
 (0)