Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bd9c6b18 authored by Sungsoo's avatar Sungsoo Committed by Jessica Wagantall
Browse files

DO NOT MERGE) ExifInterface: Close the file when an exception happens 

CYNGNOS-3312
Bug: 32068647, Bug: 30936376
Change-Id: I22fa2384348c890ca726d2b1632cd54e59d25a8f
(cherry picked from commit cb179300)
(cherry picked from commit 2c79cada)
(cherry picked from commit 596ffb80)
parent 2ad19afb

media/java/android/media/ExifInterface.java

+3 −1
Original line number Diff line number Diff line
@@ -1335,8 +1335,9 @@ public class ExifInterface { 
        for (int i = 0; i < EXIF_TAGS.length; ++i) {

            mAttributes[i] = new HashMap();

        }

        InputStream in = null;

        try {

            InputStream in = new FileInputStream(mFilename);

            in = new FileInputStream(mFilename);

            getJpegAttributes(in);

            mIsSupportedFile = true;

        } catch (IOException e) {
@@ -1349,6 +1350,7 @@ public class ExifInterface { 
            if (DEBUG) {

                printAttributes();

            }

            IoUtils.closeQuietly(in);

        }

    }