diff options
| author | Sungsoo Lim <sungsoo@google.com> | 2016-07-25 11:53:13 +0900 |
|---|---|---|
| committer | gitbuildkicker <android-build@google.com> | 2016-08-01 14:25:24 -0700 |
| commit | 5aa2601ddd7c52b740cdffdeb8afd22d0151b1d5 (patch) | |
| tree | a5e2902e7efffa28e666911f30bbd329b3d4f2f1 /media | |
| parent | e739d9ca5469ed30129d0fa228e3d0f2878671ac (diff) | |
| download | frameworks_base-5aa2601ddd7c52b740cdffdeb8afd22d0151b1d5.zip frameworks_base-5aa2601ddd7c52b740cdffdeb8afd22d0151b1d5.tar.gz frameworks_base-5aa2601ddd7c52b740cdffdeb8afd22d0151b1d5.tar.bz2 | |
DO NOT MERGE: Fix CTS regression
Bug: 30297223, Bug: 30437363
Change-Id: I7b18af40e4eac2713577204428fbfb96cc346582
Diffstat (limited to 'media')
| -rw-r--r-- | media/java/android/media/ExifInterface.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/media/java/android/media/ExifInterface.java b/media/java/android/media/ExifInterface.java index c5e978f..74bb55b 100644 --- a/media/java/android/media/ExifInterface.java +++ b/media/java/android/media/ExifInterface.java @@ -1330,12 +1330,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 |