Merge "DO NOT MERGE: Fix CTS regression" into lmp-dev
This commit is contained in:
@@ -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 {
|
||||||
|
// Initialize mAttributes.
|
||||||
|
for (int i = 0; i < EXIF_TAGS.length; ++i) {
|
||||||
|
mAttributes[i] = new HashMap();
|
||||||
|
}
|
||||||
try {
|
try {
|
||||||
InputStream in = new FileInputStream(mFilename);
|
InputStream in = new FileInputStream(mFilename);
|
||||||
// Initialize mAttributes.
|
|
||||||
for (int i = 0; i < EXIF_TAGS.length; ++i) {
|
|
||||||
mAttributes[i] = new HashMap();
|
|
||||||
}
|
|
||||||
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
|
||||||
|
|||||||
Reference in New Issue
Block a user