From d065a828da8c659f49833d7dbc08c63b9a82827b Mon Sep 17 00:00:00 2001 From: Ray Essick Date: Wed, 7 Jun 2023 11:16:55 +0000 Subject: Revert "Use a ExifInterface ctor with a file descriptor as a parameter" This reverts commit e106aa909b2aafb12644a695cf4e1d36a8e1f60e. Reason for revert: OEM reports regressions Bug: 199822700 Bug: 283908789 (cherry picked from https://android-review.googlesource.com/q/commit:2f9e9118ff556bca2e9651f05a821c8e570fbe52) Merged-In: Ic00be58b718be5e53823d81fa64cb718a87ed05a Change-Id: Ic00be58b718be5e53823d81fa64cb718a87ed05a --- media/java/android/media/ThumbnailUtils.java | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/media/java/android/media/ThumbnailUtils.java b/media/java/android/media/ThumbnailUtils.java index 6744359d12d7..9b238e172247 100644 --- a/media/java/android/media/ThumbnailUtils.java +++ b/media/java/android/media/ThumbnailUtils.java @@ -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,19 +255,17 @@ public class ThumbnailUtils { // get orientation if (MediaFile.isExifMimeType(mimeType)) { - try (FileInputStream is = new FileInputStream(file)) { - exif = new ExifInterface(is.getFD()); - switch (exif.getAttributeInt(ExifInterface.TAG_ORIENTATION, 0)) { - case ExifInterface.ORIENTATION_ROTATE_90: - orientation = 90; - break; - case ExifInterface.ORIENTATION_ROTATE_180: - orientation = 180; - break; - case ExifInterface.ORIENTATION_ROTATE_270: - orientation = 270; - break; - } + exif = new ExifInterface(file); + switch (exif.getAttributeInt(ExifInterface.TAG_ORIENTATION, 0)) { + case ExifInterface.ORIENTATION_ROTATE_90: + orientation = 90; + break; + case ExifInterface.ORIENTATION_ROTATE_180: + orientation = 180; + break; + case ExifInterface.ORIENTATION_ROTATE_270: + orientation = 270; + break; } } -- cgit v1.2.3-59-g8ed1b