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

Commit af1f86b3 authored by Ray Essick's avatar Ray Essick Committed by Gerrit Code Review
Browse files

Merge "Revert "Use a ExifInterface ctor with a file descriptor as a parameter""

parents 6460d464 2f9e9118
Loading
Loading
Loading
Loading
+11 −14
Original line number Diff line number Diff line
@@ -49,7 +49,6 @@ import com.android.internal.util.ArrayUtils;
import libcore.io.IoUtils;

import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.util.Arrays;
import java.util.Comparator;
@@ -256,8 +255,7 @@ public class ThumbnailUtils {

        // get orientation
        if (MediaFile.isExifMimeType(mimeType)) {
            try (FileInputStream is = new FileInputStream(file)) {
                exif = new ExifInterface(is.getFD());
            exif = new ExifInterface(file);
            switch (exif.getAttributeInt(ExifInterface.TAG_ORIENTATION, 0)) {
                case ExifInterface.ORIENTATION_ROTATE_90:
                    orientation = 90;
@@ -270,7 +268,6 @@ public class ThumbnailUtils {
                    break;
            }
        }
        }

        if (mimeType.equals("image/heif")
                || mimeType.equals("image/heif-sequence")